From c0258ca9b7d39daffa7347fb3b31cc641c2cfb24 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 11 Feb 2022 10:36:38 -0600 Subject: [PATCH] address review comments --- tests/performance/performance_test_driver.h | 2 +- tests/performance/timing_step_22.cc | 12 ++++++------ tests/performance/timing_step_3.cc | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/performance/performance_test_driver.h b/tests/performance/performance_test_driver.h index 5d7fe759c5..10affa3e95 100644 --- a/tests/performance/performance_test_driver.h +++ b/tests/performance/performance_test_driver.h @@ -159,7 +159,7 @@ main(int argc, char *argv[]) } else { - pout << "name\tmin\tmax\taverage\tstd_dev\tsamples\n"; + pout << "name\tmin\tmax\tmean\tstd_dev\tsamples\n"; } // Perform measurements: diff --git a/tests/performance/timing_step_22.cc b/tests/performance/timing_step_22.cc index c5cccbecba..b9fdb93f79 100644 --- a/tests/performance/timing_step_22.cc +++ b/tests/performance/timing_step_22.cc @@ -16,7 +16,7 @@ // // Description: // -// A performance benchmark based on step 3 that measures timings for system +// A performance benchmark based on step 22 that measures timings for system // setup, assembly, solve and postprocessing for a Stokes problem. // @@ -647,11 +647,11 @@ StokesProblem::run() debug_output << std::endl; } - return {timer["refinement"].cpu_time(), - timer["setup_system"].cpu_time(), - timer["assemble_system"].cpu_time(), - timer["solve"].cpu_time(), - timer["output_results"].cpu_time()}; + return {timer["refinement"].wall_time(), + timer["setup_system"].wall_time(), + timer["assemble_system"].wall_time(), + timer["solve"].wall_time(), + timer["output_results"].wall_time()}; } diff --git a/tests/performance/timing_step_3.cc b/tests/performance/timing_step_3.cc index 4c6186873f..64a5a1dd46 100644 --- a/tests/performance/timing_step_3.cc +++ b/tests/performance/timing_step_3.cc @@ -235,11 +235,11 @@ Step3::run() output_results(); timer["output_results"].stop(); - return {timer["make_grid"].cpu_time(), - timer["setup_system"].cpu_time(), - timer["assemble_system"].cpu_time(), - timer["solve"].cpu_time(), - timer["output_results"].cpu_time()}; + return {timer["make_grid"].wall_time(), + timer["setup_system"].wall_time(), + timer["assemble_system"].wall_time(), + timer["solve"].wall_time(), + timer["output_results"].wall_time()}; } -- 2.39.5