Benchmarker: Optionally disable copying plotting script

JeffersonLab · Nov 9, 2023 · 722a458 · 722a458
1 parent fbca64d
commit 722a458
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/scripts/jana-plot-scaletest.py b/scripts/jana-plot-scaletest.py
@@ -37,15 +37,15 @@
  You can control several parameters of the test using these
  JANA configuration parameters:
 
-   BENCHMARK:NSAMPLES     # Number of samples for each benchmark test
-   BENCHMARK:MINTHREADS   # Minimum number of threads for benchmark test
-   BENCHMARK:MAXTHREADS   # Maximum number of threads for benchmark test
-   BENCHMARK:RESULTSDIR   # Output directory name for benchmark test results
-   BENCHMARK:THREADSTEP   # Delta number of threads between each benchmark test
+   benchmark:nsamples     # Number of samples for each benchmark test
+   benchmark:minthreads   # Minimum number of threads for benchmark test
+   benchmark:maxthreads   # Maximum number of threads for benchmark test
+   benchmark:resultsdir   # Output directory name for benchmark test results
+   benchmark:threadstep   # Delta number of threads between each benchmark test
 
  Run "jana -c -b" to see the default values for each of these.
 
- To use this just go into the BENCHMARK:RESULTSDIR where the
+ To use this just go into the benchmark:resultsdir where the
  rates.dat file is and run it. Note that you must have python
  installed as well as the numpy and matplotlib python packages.
 

diff --git a/src/libraries/JANA/CLI/JBenchmarker.cc b/src/libraries/JANA/CLI/JBenchmarker.cc
@@ -47,6 +47,11 @@ JBenchmarker::JBenchmarker(JApplication* app) : m_app(app) {
             m_output_dir,
             "Output directory name for benchmark test results");
 
+    params->SetDefaultParameter(
+            "benchmark:copyscript",
+            m_copy_script,
+            "Copy plotting script to results dir");
+
     params->SetParameter("nthreads", m_max_threads);
     // Otherwise JApplication::Scale() doesn't scale up. This is an interesting bug. TODO: Remove me when fixed.
 }
@@ -61,6 +66,7 @@ void JBenchmarker::RunUntilFinished() {
                        << "    benchmark:minthreads = " << m_min_threads << "\n"
                        << "    benchmark:maxthreads = " << m_max_threads << "\n"
                        << "    benchmark:threadstep = " << m_thread_step << "\n"
+                       << "    benchmark:nsamples = " << m_nsamples << "\n"
                        << "    benchmark:resultsdir = " << m_output_dir << LOG_END;
 
     m_app->SetTicker(false);
@@ -140,12 +146,19 @@ void JBenchmarker::RunUntilFinished() {
     }
     ofs2.close();
 
-    copy_to_output_dir("${JANA_HOME}/bin/jana-plot-scaletest.py");
-
-    LOG_INFO(m_logger) 
-        << "Testing finished. To view a plot of test results:\n" 
-        << "    cd " << m_output_dir 
-        << "\n    ./jana-plot-scaletest.py\n" << LOG_END;
+    if (m_copy_script) {
+        copy_to_output_dir("${JANA_HOME}/bin/jana-plot-scaletest.py");
+        LOG_INFO(m_logger)
+            << "Testing finished. To view a plot of test results:\n"
+            << "    cd " << m_output_dir
+            << "\n    ./jana-plot-scaletest.py\n" << LOG_END;
+    }
+    else {
+        LOG_INFO(m_logger) 
+            << "Testing finished. To view a plot of test results:\n"
+            << "    cd " << m_output_dir << "\n"
+            << "    $JANA_HOME/bin/jana-plot-scaletest.py\n" << LOG_END;
+    }
     m_app->Stop();
 }
 

diff --git a/src/libraries/JANA/CLI/JBenchmarker.h b/src/libraries/JANA/CLI/JBenchmarker.h
@@ -17,6 +17,7 @@ class JBenchmarker {
     unsigned m_thread_step = 1;
     unsigned m_nsamples = 15;
     std::string m_output_dir = "JANA_Test_Results";
+    bool m_copy_script = true;
 
 public:
     explicit JBenchmarker(JApplication* app);

diff --git a/src/programs/perf_tests/PerfTests.cc b/src/programs/perf_tests/PerfTests.cc
@@ -8,6 +8,7 @@
 
 #include <JANA/JApplication.h>
 #include <JANA/JFactoryGenerator.h>
+#include <JANA/CLI/JBenchmarker.h>
 #if HAVE_PODIO
 #include <PodioStressTest.h>
 #endif
@@ -51,12 +52,15 @@ int main() {
         params->SetParameter("log:off", "JApplication,JPluginLoader,JArrowProcessingController,JArrow"); // Log levels get set as soon as JApp gets constructed XD
         params->SetParameter("jtest:parser_ms", 2);
 
+        params->SetParameter("benchmark:resultsdir", "perftest_fake_halldrecon");
+
         JApplication app(params);
         auto logger = app.GetService<JLoggingService>()->get_logger("PerfTests");
         app.AddPlugin("JTest");
 
         LOG_INFO(logger) << "Running JTest tuned to imitate halld_recon:" << LOG_END;
-        benchmark(app);
+        JBenchmarker benchmarker(&app);
+        benchmarker.RunUntilFinished();
     }
 
 
@@ -85,12 +89,15 @@ int main() {
         params->SetParameter("jtest:plotter_bytes", 0);
         params->SetParameter("jtest:plotter_bytes_spread", 0);
 
+        params->SetParameter("benchmark:resultsdir", "perftest_pure_overhead");
+
         JApplication app(params);
         auto logger = app.GetService<JLoggingService>()->get_logger("PerfTests");
         app.AddPlugin("JTest");
 
         LOG_INFO(logger) << "Running JTest with all sleeps and computations turned off" << LOG_END;
-        benchmark(app);
+        JBenchmarker benchmarker(&app);
+        benchmarker.RunUntilFinished();
     }
 
 #if HAVE_PODIO