--- /dev/null
+#include "smpi/smpi_utils.hpp"
+#include "src/smpi/SmpiHost.hpp"
+#include <simgrid/s4u/VirtualMachine.hpp>
+#include <string>
+#include <vector>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_host, smpi, "Logging specific to SMPI (host)");
+
+namespace simgrid {
+namespace smpi {
+
+simgrid::xbt::Extension<simgrid::s4u::Host, SmpiHost> SmpiHost::EXTENSION_ID;
+
+double SmpiHost::orecv(size_t size)
+{
+ double current = orecv_parsed_values.empty() ? 0.0 : orecv_parsed_values.front().values[0] +
+ orecv_parsed_values.front().values[1] * size;
+
+ // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
+ // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the vector we iterate over!
+ for (auto fact : orecv_parsed_values) {
+ if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
+ XBT_DEBUG("or : %zu <= %zu return %.10f", size, fact.factor, current);
+ return current;
+ } else {
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
+ current=fact.values[0]+fact.values[1]*size;
+ }
+ }
+ XBT_DEBUG("smpi_or: %zu is larger than largest boundary, return %.10f", size, current);
+
+ return current;
+}
+
+double SmpiHost::osend(size_t size)
+{
+ double current =
+ osend_parsed_values.empty() ? 0.0 : osend_parsed_values[0].values[0] + osend_parsed_values[0].values[1] * size;
+ // Iterate over all the sections that were specified and find the right
+ // value. (fact.factor represents the interval sizes; we want to find the
+ // section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the vector we iterate over!
+ for (auto& fact : osend_parsed_values) {
+ if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
+ XBT_DEBUG("os : %zu <= %zu return %.10f", size, fact.factor, current);
+ return current;
+ } else {
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
+ current = fact.values[0] + fact.values[1] * size;
+ }
+ }
+ XBT_DEBUG("Searching for smpi/os: %zu is larger than the largest boundary, return %.10f", size, current);
+
+ return current;
+}
+
+double SmpiHost::oisend(size_t size)
+{
+ double current =
+ oisend_parsed_values.empty() ? 0.0 : oisend_parsed_values[0].values[0] + oisend_parsed_values[0].values[1] * size;
+
+ // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
+ // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the vector we iterate over!
+ for (auto& fact : oisend_parsed_values) {
+ if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
+ XBT_DEBUG("ois : %zu <= %zu return %.10f", size, fact.factor, current);
+ return current;
+ } else {
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
+ current = fact.values[0] + fact.values[1] * size;
+ }
+ }
+ XBT_DEBUG("Searching for smpi/ois: %zu is larger than the largest boundary, return %.10f", size, current);
+
+ return current;
+}
+
+SmpiHost::SmpiHost(simgrid::s4u::Host *ptr) : host(ptr)
+{
+ if (!SmpiHost::EXTENSION_ID.valid())
+ SmpiHost::EXTENSION_ID = simgrid::s4u::Host::extension_create<SmpiHost>();
+
+ const char* orecv_string = host->property("smpi/or");
+ if (orecv_string != nullptr) {
+ orecv_parsed_values = parse_factor(orecv_string);
+ } else {
+ orecv_parsed_values = parse_factor(xbt_cfg_get_string("smpi/or"));
+ }
+
+ const char* osend_string = host->property("smpi/os");
+ if (osend_string != nullptr) {
+ osend_parsed_values = parse_factor(osend_string);
+ } else {
+ osend_parsed_values = parse_factor(xbt_cfg_get_string("smpi/os"));
+ }
+
+ const char* oisend_string = host->property("smpi/ois");
+ if (oisend_string != nullptr) {
+ oisend_parsed_values = parse_factor(oisend_string);
+ } else {
+ oisend_parsed_values = parse_factor(xbt_cfg_get_string("smpi/ois"));
+ }
+}
+
+SmpiHost::~SmpiHost()=default;
+
+static void onCreation(simgrid::s4u::Host& host)
+{
+}
+
+static void onHostDestruction(simgrid::s4u::Host& host)
+{
+ // Ignore virtual machines
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))
+ return;
+}
+
+void sg_smpi_host_init()
+{
+ simgrid::s4u::Host::onCreation.connect(&onCreation);
+ simgrid::s4u::Host::onDestruction.connect(&onHostDestruction);
+}
+
+}
+}
--- /dev/null
+#ifndef SMPI_HOST_HPP_
+#define SMPI_HOST_HPP_
+
+#include "src/include/smpi/smpi_utils.hpp"
+
+#include <simgrid/s4u/host.hpp>
+#include <string>
+#include <vector>
+#include <xbt/config.hpp>
+#include <xbt/Extendable.hpp>
+
+
+
+namespace simgrid {
+namespace smpi {
+
+void sg_smpi_host_init();
+static void onHostDestruction(simgrid::s4u::Host& host);
+static void onCreation(simgrid::s4u::Host& host);
+
+class SmpiHost {
+
+ private:
+ std::vector<s_smpi_factor_t> orecv_parsed_values;
+ std::vector<s_smpi_factor_t> osend_parsed_values;
+ std::vector<s_smpi_factor_t> oisend_parsed_values;
+ simgrid::s4u::Host *host = nullptr;
+
+ public:
+ static simgrid::xbt::Extension<simgrid::s4u::Host, SmpiHost> EXTENSION_ID;
+
+ explicit SmpiHost(simgrid::s4u::Host *ptr);
+ ~SmpiHost();
+
+ double orecv(size_t size);
+ double osend(size_t size);
+ double oisend(size_t size);
+};
+
+}
+}
+#endif
#include "private.h"
#include "simgrid/msg.h" /* barrier */
+#include "src/smpi/SmpiHost.hpp"
#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
s_smpi_mpi_instance_t* instance = (s_smpi_mpi_instance_t*)xbt_malloc(sizeof(s_smpi_mpi_instance_t));
+ static int already_called = 0;
+ if (!already_called) {
+ already_called = 1;
+ xbt_dynar_t hosts = MSG_hosts_as_dynar();
+ unsigned int cursor;
+ void* h;
+ xbt_dynar_foreach(hosts, cursor, h) {
+ simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(h);
+ host->extension_set(new simgrid::smpi::SmpiHost(host));
+ }
+ xbt_dynar_free(&hosts);
+ }
+
instance->name = name;
instance->size = num_processes;
instance->present_processes = 0;
smpi_instances = xbt_dict_new_homogeneous(xbt_free_f);
}
+
xbt_dict_set(smpi_instances, name, (void*)instance, nullptr);
}
#include "src/msg/msg_private.h"
#include "src/simix/smx_private.h"
#include "src/surf/surf_interface.hpp"
+#include "src/smpi/SmpiHost.hpp"
#include "surf/surf.h"
#include "xbt/replay.hpp"
#include <xbt/config.hpp>
SMPI_switch_data_segment = &smpi_switch_data_segment;
+ simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
+ host.extension_set(new simgrid::smpi::SmpiHost(&host));
+ });
+
// parse the platform file: get the host list
SIMIX_create_environment(argv[1]);
SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
#include "src/simix/smx_private.h"
#include "simgrid/sg_config.h"
#include "smpi/smpi_utils.hpp"
+#include "src/smpi/SmpiHost.hpp"
#include <simgrid/s4u/host.hpp>
#include "src/kernel/activity/SynchroComm.hpp"
static simgrid::config::Flag<double> smpi_test_sleep(
"smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4);
-std::vector<s_smpi_factor_t> smpi_os_values;
-std::vector<s_smpi_factor_t> smpi_or_values;
std::vector<s_smpi_factor_t> smpi_ois_values;
extern void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t);
-static double smpi_os(size_t size)
-{
- if (smpi_os_values.empty()) {
- smpi_os_values = parse_factor(xbt_cfg_get_string("smpi/os"));
- }
- double current=smpi_os_values.empty()?0.0:smpi_os_values[0].values[0]+smpi_os_values[0].values[1]*size;
- // Iterate over all the sections that were specified and find the right
- // value. (fact.factor represents the interval sizes; we want to find the
- // section that has fact.factor <= size and no other such fact.factor <= size)
- // Note: parse_factor() (used before) already sorts the vector we iterate over!
- for (auto& fact : smpi_os_values) {
- if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
- XBT_DEBUG("os : %zu <= %zu return %.10f", size, fact.factor, current);
- return current;
- }else{
- // If the next section is too large, the current section must be used.
- // Hence, save the cost, as we might have to use it.
- current = fact.values[0]+fact.values[1]*size;
- }
- }
- XBT_DEBUG("Searching for smpi/os: %zu is larger than the largest boundary, return %.10f", size, current);
-
- return current;
-}
-
-static double smpi_ois(size_t size)
-{
- if (smpi_ois_values.empty()) {
- smpi_ois_values = parse_factor(xbt_cfg_get_string("smpi/ois"));
- }
- double current=smpi_ois_values.empty()?0.0:smpi_ois_values[0].values[0]+smpi_ois_values[0].values[1]*size;
- // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
- // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
- // Note: parse_factor() (used before) already sorts the vector we iterate over!
- for (auto& fact : smpi_ois_values) {
- if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
- XBT_DEBUG("ois : %zu <= %zu return %.10f", size, fact.factor, current);
- return current;
- }else{
- // If the next section is too large, the current section must be used.
- // Hence, save the cost, as we might have to use it.
- current = fact.values[0]+fact.values[1]*size;
- }
- }
- XBT_DEBUG("Searching for smpi/ois: %zu is larger than the largest boundary, return %.10f", size, current);
-
- return current;
-}
-
-static double smpi_or(size_t size)
-{
- if (smpi_or_values.empty()) {
- smpi_or_values = parse_factor(xbt_cfg_get_string("smpi/or"));
- }
-
- double current=smpi_or_values.empty()?0.0:smpi_or_values.front().values[0]+smpi_or_values.front().values[1]*size;
-
- // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
- // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
- // Note: parse_factor() (used before) already sorts the vector we iterate over!
- for (auto fact : smpi_or_values) {
- if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
- XBT_DEBUG("or : %zu <= %zu return %.10f", size, fact.factor, current);
- return current;
- } else {
- // If the next section is too large, the current section must be used.
- // Hence, save the cost, as we might have to use it.
- current=fact.values[0]+fact.values[1]*size;
- }
- }
- XBT_DEBUG("smpi_or: %zu is larger than largest boundary, return %.10f", size, current);
-
- return current;
-}
-
namespace simgrid{
namespace smpi{
if(!(old_type_->flags() & DT_FLAG_DERIVED)){
oldbuf = buf_;
if (!process->replaying() && oldbuf != nullptr && size_!=0){
- if((smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP)
+ if((smpi_privatize_global_variables != 0)
&& (static_cast<char*>(buf_) >= smpi_start_data_exe)
&& (static_cast<char*>(buf_) < smpi_start_data_exe + smpi_size_data_exe )){
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
//if we are giving back the control to the user without waiting for completion, we have to inject timings
double sleeptime = 0.0;
- if(detached_ != 0 || ((flags_ & (ISEND|SSEND)) != 0)){// issend should be treated as isend
- //isend and send timings may be different
- sleeptime = ((flags_ & ISEND) != 0) ? smpi_ois(size_) : smpi_os(size_);
+ if (detached_ != 0 || ((flags_ & (ISEND | SSEND)) != 0)) { // issend should be treated as isend
+ // isend and send timings may be different
+ sleeptime = ((flags_ & ISEND) != 0)
+ ? simgrid::s4u::Actor::self()->host()->extension<simgrid::smpi::SmpiHost>()->oisend(size_)
+ : simgrid::s4u::Actor::self()->host()->extension<simgrid::smpi::SmpiHost>()->osend(size_);
}
if(sleeptime > 0.0){
if((((req->flags_ & ACCUMULATE) != 0) || (datatype->flags() & DT_FLAG_DERIVED)) && (!smpi_is_shared(req->old_buf_))){
if (!smpi_process()->replaying()){
- if( smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP && (static_cast<char*>(req->old_buf_) >= smpi_start_data_exe)
+ if( smpi_privatize_global_variables != 0 && (static_cast<char*>(req->old_buf_) >= smpi_start_data_exe)
&& ((char*)req->old_buf_ < smpi_start_data_exe + smpi_size_data_exe )){
XBT_VERB("Privatization : We are unserializing to a zone in global memory Switch data segment ");
smpi_switch_data_segment(smpi_process()->index());
}
if(req->detached_sender_ != nullptr){
//integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0
- double sleeptime = smpi_or(req->real_size_);
+ double sleeptime = simgrid::s4u::Actor::self()->host()->extension<simgrid::smpi::SmpiHost>()->orecv(req->real_size());
if(sleeptime > 0.0){
simcall_process_sleep(sleeptime);
XBT_DEBUG("receiving size of %zu : sleep %f ", req->real_size_, sleeptime);
src/smpi/smpi_f2c.hpp
src/smpi/smpi_group.cpp
src/smpi/smpi_group.hpp
+ src/smpi/SmpiHost.cpp
+ src/smpi/SmpiHost.hpp
src/smpi/smpi_mpi.cpp
src/smpi/smpi_datatype.cpp
src/smpi/smpi_datatype.hpp
