applied comments

Author: lslusarczyk

devops/scripts/benchmarks/benches/compute.py

@@ -269,53 +269,45 @@ def benchmarks(self) -> list[Benchmark]:
                 )
             )
 
-        record_and_replay_params = product(list(PROFILERS), [0, 1], [0, 1])
-        for profiler_type, emulate, instantiate in record_and_replay_params:
-            benches += [
-                RecordAndReplay(
+        record_and_replay_params = product([0, 1], [0, 1])
+        for emulate, instantiate in record_and_replay_params:
+
+            def createRrBench(**kwargs):
+                return RecordAndReplay(
                     self,
                     RUNTIMES.LEVEL_ZERO,
-                    profiler_type,
+                    PROFILERS.TIMER,
+                    mRec=1,
+                    mInst=instantiate,
+                    mDest=0,
+                    emulate=emulate,
+                    **kwargs,
+                )
+
+            benches += [
+                createRrBench(
                     nForksInLvl=2,
                     nLvls=4,
                     nCmdSetsInLvl=10,
                     nInstantiations=10,
                     nAppendKern=10,
                     nAppendCopy=1,
-                    mRec=1,
-                    mInst=instantiate,
-                    mDest=0,
-                    emulate=emulate,
                 ),
-                RecordAndReplay(
-                    self,
-                    RUNTIMES.LEVEL_ZERO,
-                    profiler_type,
+                createRrBench(
                     nForksInLvl=1,
                     nLvls=1,
                     nCmdSetsInLvl=10,
                     nInstantiations=10,
                     nAppendKern=10,
                     nAppendCopy=10,
-                    mRec=1,
-                    mInst=instantiate,
-                    mDest=0,
-                    emulate=emulate,
                 ),
-                RecordAndReplay(
-                    self,
-                    RUNTIMES.LEVEL_ZERO,
-                    profiler_type,
+                createRrBench(
                     nForksInLvl=1,
                     nLvls=4,
                     nCmdSetsInLvl=1,
                     nInstantiations=0,
                     nAppendKern=1,
                     nAppendCopy=0,
-                    mRec=1,
-                    mInst=instantiate,
-                    mDest=0,
-                    emulate=emulate,
                 ),
             ]
 
@@ -711,7 +703,7 @@ def __init__(self, bench, runtime: RUNTIMES, profiler_type, **kwargs):
         )
 
     def name(self):
-        ret = [self.profiler_type.value]
+        ret = []
         for k, v in self.rr_params.items():
             if k[0] == "n":  # numeric parameter
                 ret.append(f"{k[1:]} {v}")
@@ -722,14 +714,11 @@ def name(self):
                 if v != 0:
                     ret.append(k)
         ret.sort()
-        return f"{self.bench_name} {self.test} " + ", ".join(ret)
+        return f"L0 {self.test} " + ", ".join(ret)
 
     def display_name(self) -> str:
         return self.name()
 
-    def description(self) -> str:
-        return f"{self.runtime.value} Graphs record and replay"
-
     def get_tags(self):
         return ["L0"]
 

devops/scripts/benchmarks/git_project.py

@@ -2,6 +2,7 @@
 # Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
 import os
 from pathlib import Path
 import shutil
@@ -10,7 +11,6 @@
 from utils.utils import run
 from options import options
 
-
 class GitProject:
     def __init__(
         self,

devops/scripts/benchmarks/tests/test_integration.py

@@ -1,29 +1,34 @@
+# Copyright (C) 2025 Intel Corporation
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
 import os
 import shutil
 import unittest
-import logging
-
+import tempfile
 import subprocess
 import json
 from collections import namedtuple
 
+# oneapi has to be installed and sourced for sycl benchmarks tests
+
 DataJson = namedtuple("DataJson", ["runs", "metadata", "tags", "names"])
 DataJsonRun = namedtuple("DataJsonRun", ["name", "results"])
 DataJsonResult = namedtuple(
     "DataJsonResult", ["name", "label", "suite", "value", "unit"]
 )
 
-
 class App:
     def __init__(self):
-        self.TMP_DIR = os.path.dirname(__file__)
-        self.OUTPUT_DIR = os.path.join(self.TMP_DIR, "tmp-output")
-        self.RESULTS_DIR = os.path.join(self.TMP_DIR, "tmp-results")
-        self.WORKDIR_DIR = os.path.join(self.TMP_DIR, "tmp-workdir")
+        self.OUTPUT_DIR = None
+        self.RESULTS_DIR = None
+        self.WORKDIR_DIR = None
 
     def prepare_dirs(self):
-        for d in [self.RESULTS_DIR, self.OUTPUT_DIR, self.WORKDIR_DIR]:
-            os.makedirs(d)
+        self.OUTPUT_DIR = tempfile.mkdtemp()
+        self.RESULTS_DIR = tempfile.mkdtemp()
+        self.WORKDIR_DIR = tempfile.mkdtemp()
 
         # when UT does not want to build compute-benchmarks from scratch, it can provide prebuilt path
         cb_targetpath = os.environ.get("COMPUTE_BENCHMARKS_BUILD_PATH")
@@ -37,8 +42,8 @@ def prepare_dirs(self):
 
     def remove_dirs(self):
         for d in [self.RESULTS_DIR, self.OUTPUT_DIR, self.WORKDIR_DIR]:
-            if os.path.exists(d):
-                shutil.rmtree(d)
+            if d is not None:
+                shutil.rmtree(d, ignore_errors=True)
 
     def run_main(self, *args):
 
@@ -50,10 +55,8 @@ def run_main(self, *args):
                 self.WORKDIR_DIR,
                 "--sycl",
                 os.environ.get("ONEAPI_ROOT"),
-                "--adapter",
-                "opencl",
                 "--save",
-                "testplik",
+                "testfile",
                 "--output-html",
                 "remote",
                 "--results-dir",
@@ -72,7 +75,6 @@ def run_main(self, *args):
         )
 
     def get_output(self):
-        output_file = os.path.join(self.OUTPUT_DIR, "data.json")
         with open(output_file) as f:
             out = json.load(f)
             return DataJson(
@@ -114,16 +116,15 @@ def tearDown(self):
         self.app.remove_dirs()
 
     def test_record_and_replay(self):
-        caseName = "RecordGraph AppendCopy 1, AppendKern 10, CmdSetsInLvl 10, ForksInLvl 2, Instantiations 10, Lvls 4, Rec, timer"
-        run_result = self.app.run_main("--filter", caseName)
+        caseName = "L0 RecordGraph AppendCopy 1, AppendKern 10, CmdSetsInLvl 10, ForksInLvl 2, Instantiations 10, Lvls 4, Rec"
+        run_result = self.app.run_main("--filter", caseName + "$")
         self.assertEqual(run_result.returncode, 0, "Subprocess did not exit cleanly")
 
         out = self.app.get_output()
 
-        testName = "record_and_replay_benchmark_l0 " + caseName
-        self.assertIn(testName, [r.name for r in out.runs[0].results])
+        self.assertIn(caseName, [r.name for r in out.runs[0].results])
 
-        metadata = out.metadata[testName]
+        metadata = out.metadata[caseName]
         self.assertEqual(metadata["type"], "benchmark")
         self.assertEqual(set(metadata["tags"]), {"L0"})