run_benchmarks.py script and folder

Signed-off-by: adir <adir@il.ibm.com>

Author: aaadir

cmd/benchmarking/run_benchmarks.py

@@ -115,14 +115,14 @@ def run_and_parse_non_parallel_metrics(benchName, params, folder=transfer_benchm
         f"{name} allocs": allocs,
     }
 
-def run_and_parse_parallel_metrics(test, params, folder=transfer_benchmarks_folder) -> dict:
+def run_and_parse_parallel_metrics(benchName, params, folder=transfer_benchmarks_folder) -> dict:
     if folder == "":
         folder = transfer_benchmarks_folder
 
     global I
     global output_folder_path
 
-    cmd = f"go test {folder} -test.run={test} -test.v -test.timeout 0 -bits='32' -num_inputs='2' -num_outputs='2' -workers='NumCPU' -duration='10s' -setup_samples=128 {params}"
+    cmd = f"go test {folder} -test.run={benchName} -test.v -test.timeout 0 -bits='32' -num_inputs='2' -num_outputs='2' -workers='NumCPU' -duration='10s' -setup_samples=128 {params}"
     print(f"{I} Running: {cmd}")
     I = I+1
 
@@ -135,7 +135,7 @@ def run_and_parse_parallel_metrics(test, params, folder=transfer_benchmarks_fold
         check=True
     )
 
-    log_file_path = os.path.join(output_folder_path, test+".log")
+    log_file_path = os.path.join(output_folder_path, benchName+".log")
     if not os.path.exists(log_file_path):
         with open(log_file_path, "w", encoding="utf-8") as f:
             f.write(result.stdout)
@@ -151,8 +151,6 @@ def run_and_parse_parallel_metrics(test, params, folder=transfer_benchmarks_fold
     if not name_match:
         raise ValueError("Could not extract test name")
 
-    name = name_match.group(1)
-
     # --- Unit conversion ---
     time_mult = {
         "ns": 1,
@@ -181,6 +179,7 @@ def to_ns(value: float, unit: str) -> int:
     avg_val, avg_unit = avg_lat_re.search(output).groups()
     max_val, max_unit = max_lat_re.search(output).groups()
 
+    name = benchName
     return {
         f"{name} real throughput": real_tp,
         f"{name} pure throughput": pure_tp,
@@ -243,4 +242,3 @@ def append_dict_as_row(filename: str, data: dict):
 dst = os.path.join(output_folder_path, "benchmark_results.csv")
 if os.path.exists(src) and not os.path.exists(dst):
     shutil.copy(src, dst)
-