A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use consistent naming scheme.
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_bench.cpp
diff --git
a/src/smpi/internals/smpi_bench.cpp
b/src/smpi/internals/smpi_bench.cpp
index 6eb4ab17cb04dadef79b3ff0a649a14cc3bf2471..c5bd2a073f1152638ff1799a79d74ca7fc4ec85c 100644
(file)
--- a/
src/smpi/internals/smpi_bench.cpp
+++ b/
src/smpi/internals/smpi_bench.cpp
@@
-47,27
+47,16
@@
void private_execute_flops(double flops) {
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
-void smpi_execute_flops(double flops) {
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_computing_in(rank, flops);
-
+void smpi_execute_flops(double flops)
+{
private_execute_flops(flops);
private_execute_flops(flops);
-
- TRACE_smpi_computing_out(rank);
}
void smpi_execute(double duration)
{
if (duration >= smpi_cfg_cpu_thresh()) {
XBT_DEBUG("Sleep for %g to handle real computation time", duration);
}
void smpi_execute(double duration)
{
if (duration >= smpi_cfg_cpu_thresh()) {
XBT_DEBUG("Sleep for %g to handle real computation time", duration);
- double flops = duration * smpi_cfg_host_speed();
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_computing_in(rank, flops);
-
- private_execute_flops(flops);
-
- TRACE_smpi_computing_out(rank);
-
+ private_execute_flops(duration * smpi_cfg_host_speed());
} else {
XBT_DEBUG("Real computation took %g while option smpi/cpu-threshold is set to %g => ignore it", duration,
smpi_cfg_cpu_thresh());
} else {
XBT_DEBUG("Real computation took %g while option smpi/cpu-threshold is set to %g => ignore it", duration,
smpi_cfg_cpu_thresh());
@@
-114,7
+103,7
@@
void smpi_bench_begin()
double smpi_adjust_comp_speed(){
double speedup=1;
if (smpi_cfg_comp_adjustment_file()[0] != '\0') {
double smpi_adjust_comp_speed(){
double speedup=1;
if (smpi_cfg_comp_adjustment_file()[0] != '\0') {
-
smpi_trace_call_location_t* loc
= smpi_process()->call_location();
+
const smpi_trace_call_location_t* loc
= smpi_process()->call_location();
std::string key = loc->get_composed_key();
std::unordered_map<std::string, double>::const_iterator it = location2speedup.find(key);
if (it != location2speedup.end()) {
std::string key = loc->get_composed_key();
std::unordered_map<std::string, double>::const_iterator it = location2speedup.find(key);
if (it != location2speedup.end()) {
@@
-140,7
+129,7
@@
void smpi_bench_end()
if (not smpi_cfg_papi_events_file().empty()) {
papi_counter_t& counter_data = smpi_process()->papi_counters();
int event_set = smpi_process()->papi_event_set();
if (not smpi_cfg_papi_events_file().empty()) {
papi_counter_t& counter_data = smpi_process()->papi_counters();
int event_set = smpi_process()->papi_event_set();
- std::vector<long long> event_values
= std::vector<long long>
(counter_data.size());
+ std::vector<long long> event_values(counter_data.size());
if (PAPI_stop(event_set, &event_values[0]) != PAPI_OK) { // Error
XBT_CRITICAL("Could not stop PAPI counters.\n");
if (PAPI_stop(event_set, &event_values[0]) != PAPI_OK) { // Error
XBT_CRITICAL("Could not stop PAPI counters.\n");
@@
-155,7
+144,7
@@
void smpi_bench_end()
if (smpi_process()->sampling()) {
XBT_CRITICAL("Cannot do recursive benchmarks.");
if (smpi_process()->sampling()) {
XBT_CRITICAL("Cannot do recursive benchmarks.");
- XBT_CRITICAL("Are you trying to make a call to MPI within a SMPI_SAMPLE_ block?");
+ XBT_CRITICAL("Are you trying to make a call to MPI within a
n
SMPI_SAMPLE_ block?");
xbt_backtrace_display_current();
xbt_die("Aborting.");
}
xbt_backtrace_display_current();
xbt_die("Aborting.");
}
@@
-173,7
+162,7
@@
void smpi_bench_end()
const papi_counter_t& counter_data = smpi_process()->papi_counters();
for (auto const& pair : counter_data) {
const papi_counter_t& counter_data = smpi_process()->papi_counters();
for (auto const& pair : counter_data) {
-
simgrid::instr::VariableType
* variable = static_cast<simgrid::instr::VariableType*>(container->type_->by_name(pair.first));
+
auto
* variable = static_cast<simgrid::instr::VariableType*>(container->type_->by_name(pair.first));
variable->set_event(SIMIX_get_clock(), pair.second);
}
}
variable->set_event(SIMIX_get_clock(), pair.second);
}
}
@@
-291,10
+280,10
@@
unsigned long long smpi_rastro_timestamp ()
smpi_bench_end();
double now = SIMIX_get_clock();
smpi_bench_end();
double now = SIMIX_get_clock();
-
unsigned long long sec
= static_cast<unsigned long long>(now);
+
auto sec
= static_cast<unsigned long long>(now);
unsigned long long pre = (now - sec) * smpi_rastro_resolution();
smpi_bench_begin();
unsigned long long pre = (now - sec) * smpi_rastro_resolution();
smpi_bench_begin();
- return s
tatic_cast<unsigned long long>(sec)
* smpi_rastro_resolution() + pre;
+ return s
ec
* smpi_rastro_resolution() + pre;
}
/* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/
}
/* ****************************** Functions related to the SMPI_SAMPLE_ macros ************************************/