X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/406f9bbafee691a1e31084806dc15fb292fd649b..4c8cdcc7c2a4629350cbc3d61f36d63c5bbd4341:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 82d5f23340..00d1a46035 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -15,137 +15,85 @@ #include #include #include +#include "smpi_process.hpp" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); static std::unordered_map*> keys; -static const char* smpi_colors[] = {"recv", - "1 0 0", - "irecv", - "1 0.52 0.52", - "send", - "0 0 1", - "isend", - "0.52 0.52 1", - "sendrecv", - "0 1 1", - "wait", - "1 1 0", - "waitall", - "0.78 0.78 0", - "waitany", - "0.78 0.78 0.58", - "test", - "0.52 0.52 0", - - "allgather", - "1 0 0", - "allgatherv", - "1 0.52 0.52", - "allreduce", - "1 0 1", - "alltoall", - "0.52 0 1", - "alltoallv", - "0.78 0.52 1", - "barrier", - "0 0.78 0.78", - "bcast", - "0 0.78 0.39", - "gather", - "1 1 0", - "gatherv", - "1 1 0.52", - "reduce", - "0 1 0", - "reducescatter", - "0.52 1 0.52", - "scan", - "1 0.58 0.23", - "exscan", - "1 0.54 0.25", - "scatterv", - "0.52 0 0.52", - "scatter", - "1 0.74 0.54", - - "computing", - "0 1 1", - "sleeping", - "0 0.5 0.5", - - "init", - "0 1 0", - "finalize", - "0 1 0", - - "put", - "0.3 1 0", - "get", - "0 1 0.3", - "accumulate", - "1 0.3 0", - "migration", - "0.2 0.5 0.2", - "rput", - "0.3 1 0", - "rget", - "0 1 0.3", - "raccumulate", - "1 0.3 0", - "compare_and_swap", - "0.3 1 0", - "get_accumulate", - "0 1 0.3", - "rget_accumulate", - "1 0.3 0", - "win_fence", - "1 0 0.3", - "win_post", - "1 0 0.8", - "win_wait", - "1 0.8 0", - "win_start", - "0.8 0 1", - "win_complete", - "0.8 1 0", - "win_lock", - "1 0 0.3", - "win_unlock", - "1 0 0.3", - "win_lock_all", - "1 0 0.8", - "win_unlock_all", - "1 0.8 0", - "win_flush", - "1 0 0.3", - "win_flush_local", - "1 0 0.8", - "win_flush_all", - "1 0.8 0", - "win_flush_local_all", - "1 0 0.3", - "", - ""}; - -static const char* instr_find_color(const char* state) +static std::map smpi_colors = {{"recv", "1 0 0"}, + {"irecv", "1 0.52 0.52"}, + {"send", "0 0 1"}, + {"isend", "0.52 0.52 1"}, + {"sendrecv", "0 1 1"}, + {"wait", "1 1 0"}, + {"waitall", "0.78 0.78 0"}, + {"waitany", "0.78 0.78 0.58"}, + {"test", "0.52 0.52 0"}, + + {"allgather", "1 0 0"}, + {"allgatherv", "1 0.52 0.52"}, + {"allreduce", "1 0 1"}, + {"alltoall", "0.52 0 1"}, + {"alltoallv", "0.78 0.52 1"}, + {"barrier", "0 0.78 0.78"}, + {"bcast", "0 0.78 0.39"}, + {"gather", "1 1 0"}, + {"gatherv", "1 1 0.52"}, + {"reduce", "0 1 0"}, + {"reducescatter", "0.52 1 0.52"}, + {"scan", "1 0.58 0.23"}, + {"exscan", "1 0.54 0.25"}, + {"scatterv", "0.52 0 0.52"}, + {"scatter", "1 0.74 0.54"}, + + {"computing", "0 1 1"}, + {"sleeping", "0 0.5 0.5"}, + + {"init", "0 1 0"}, + {"finalize", "0 1 0"}, + + {"put", "0.3 1 0"}, + {"get", "0 1 0.3"}, + {"accumulate", "1 0.3 0"}, + {"migration", "0.2 0.5 0.2"}, + {"rput", "0.3 1 0"}, + {"rget", "0 1 0.3"}, + {"raccumulate", "1 0.3 0"}, + {"compare_and_swap", "0.3 1 0"}, + {"get_accumulate", "0 1 0.3"}, + {"rget_accumulate", "1 0.3 0"}, + {"win_fence", "1 0 0.3"}, + {"win_post", "1 0 0.8"}, + {"win_wait", "1 0.8 0"}, + {"win_start", "0.8 0 1"}, + {"win_complete", "0.8 1 0"}, + {"win_lock", "1 0 0.3"}, + {"win_unlock", "1 0 0.3"}, + {"win_lock_all", "1 0 0.8"}, + {"win_unlock_all", "1 0.8 0"}, + {"win_flush", "1 0 0.3"}, + {"win_flush_local", "1 0 0.8"}, + {"win_flush_all", "1 0.8 0"}, + {"win_flush_local_all", "1 0 0.3"} +}; + +static const char* instr_find_color(std::string state) { - std::string target = std::string(state); - boost::algorithm::to_lower(target); - const char* ret = nullptr; - unsigned int i = 0; - const char* current = smpi_colors[i]; - while (current != nullptr) { - if (target == current // exact match - || strstr(target.c_str(), current) != 0) { // as substring - ret = smpi_colors[i + 1]; - break; - } - i+=2; - current = smpi_colors[i]; + boost::algorithm::to_lower(state); + if (state.substr(0, 5) == "pmpi_") + state = state.substr(5, std::string::npos); // Remove pmpi_ to allow for exact matches + + if (smpi_colors.find(state) != smpi_colors.end()) { // Exact match in the map? + return smpi_colors.find(state)->second.c_str(); + } + for (const auto& pair : smpi_colors) { // Is an entry of our map a substring of this state name? + if (std::strstr(state.c_str(), pair.first.c_str()) != 0) + return pair.second.c_str(); } - return ret; + + return "0.5 0.5 0.5"; // Just in case we find nothing in the map ... } XBT_PRIVATE container_t smpi_container(int rank) @@ -241,7 +189,7 @@ void TRACE_smpi_init(int rank) TRACE_smpi_setup_container(rank, sg_host_self()); #if HAVE_PAPI - container_t container = simgrid::instr::Container::by_name(str); + container_t container = smpi_container(rank); papi_counter_t counters = smpi_process()->papi_counters(); for (auto const& it : counters) { @@ -249,9 +197,7 @@ void TRACE_smpi_init(int rank) * Check whether this variable already exists or not. Otherwise, it will be created * multiple times but only the last one would be used... */ - if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) { - Type::variableNew(it.first.c_str(), "", container->type_); - } + container->type_->by_name_or_create(it.first, ""); } #endif } @@ -271,6 +217,13 @@ void TRACE_smpi_computing_init(int rank) smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("computing", instr_find_color("computing")); } +void TRACE_smpi_sleeping_init(int rank) +{ + //first use, initialize the color in the trace + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) + smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("sleeping", instr_find_color("sleeping")); +} + void TRACE_smpi_computing_in(int rank, double amount) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) @@ -295,24 +248,7 @@ void TRACE_smpi_sleeping_in(int rank, double duration) void TRACE_smpi_sleeping_out(int rank) { - if (TRACE_smpi_is_enabled() && not TRACE_smpi_is_sleeping()) - smpi_container(rank)->get_state("MPI_STATE")->pop_event(); -} - -void TRACE_smpi_testing_in(int rank) -{ - //do not forget to set the color first, otherwise this will explode - if (not TRACE_smpi_is_enabled()) - return; - - simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); - state->add_entity_value("test"); - state->push_event("test", new simgrid::instr::NoOpTIData("test")); -} - -void TRACE_smpi_testing_out(int rank) -{ - if (TRACE_smpi_is_enabled()) + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } @@ -359,7 +295,7 @@ void TRACE_smpi_recv(int src, int dst, int tag) /**************** Functions to trace the migration of tasks. *****************/ void TRACE_smpi_send_process_data_in(int rank) { - if (!TRACE_smpi_is_enabled()) return; + if (not TRACE_smpi_is_enabled()) return; smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value("migration", instr_find_color("migration")); smpi_container(rank)->get_state("MIGRATE_STATE")->push_event("migration"); @@ -367,7 +303,7 @@ void TRACE_smpi_send_process_data_in(int rank) void TRACE_smpi_send_process_data_out(int rank) { - if (!TRACE_smpi_is_enabled()) return; + if (not TRACE_smpi_is_enabled()) return; /* Clean the process state. */ smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event();