Merge branch 'intel:sycl' into cb_events2

Author: mateuszpn

devops/scripts/benchmarks/benches/compute.py

@@ -310,14 +310,14 @@ def benchmarks(self) -> list[Benchmark]:
 class ComputeBenchmark(Benchmark):
     def __init__(
         self,
-        bench,
-        name,
-        test,
+        suite: ComputeBench,
+        name: str,
+        test: str,
         runtime: RUNTIMES = None,
         profiler_type: PROFILERS = PROFILERS.TIMER,
     ):
-        super().__init__(bench)
-        self.bench = bench
+        super().__init__(suite)
+        self.suite = suite
         self.bench_name = name
         self.test = test
         self.runtime = runtime
@@ -333,7 +333,7 @@ def __init__(
     @property
     def benchmark_bin(self) -> Path:
         """Returns the path to the benchmark binary"""
-        return self.bench.project.build_dir / "bin" / self.bench_name
+        return self.suite.project.build_dir / "bin" / self.bench_name
 
     def cpu_count_str(self, separator: str = "") -> str:
         # Note: SYCL CI currently relies on this "CPU count" value.
@@ -439,8 +439,8 @@ def run(
                     command=command,
                     env=env_vars,
                     unit=unit,
-                    git_url=self.bench.git_url(),
-                    git_hash=self.bench.git_hash(),
+                    git_url=self.suite.git_url(),
+                    git_hash=self.suite.git_hash(),
                 )
             )
         return ret

devops/scripts/benchmarks/benches/llamacpp.py

@@ -76,13 +76,13 @@ def benchmarks(self) -> list[Benchmark]:
 
 
 class LlamaBench(Benchmark):
-    def __init__(self, bench):
-        super().__init__(bench)
-        self.bench = bench
+    def __init__(self, suite: LlamaCppBench):
+        super().__init__(suite)
+        self.suite = suite
 
     @property
     def benchmark_bin(self) -> Path:
-        return self.bench.project.build_dir / "bin" / "llama-bench"
+        return self.suite.project.build_dir / "bin" / "llama-bench"
 
     def enabled(self):
         if options.sycl is None:
@@ -138,13 +138,13 @@ def run(
             "--mmap",
             "0",
             "--model",
-            f"{self.bench.model}",
+            f"{self.suite.model}",
         ]
 
         result = self.run_bench(
             command,
             env_vars,
-            ld_library=self.bench.oneapi.ld_libraries(),
+            ld_library=self.suite.oneapi.ld_libraries(),
             run_trace=run_trace,
             force_trace=force_trace,
         )
@@ -160,8 +160,8 @@ def run(
                     command=command,
                     env=env_vars,
                     unit="token/s",
-                    git_url=self.bench.git_url(),
-                    git_hash=self.bench.git_hash(),
+                    git_url=self.suite.git_url(),
+                    git_hash=self.suite.git_hash(),
                 )
             )
         return results

devops/scripts/benchmarks/benches/syclbench.py

@@ -102,15 +102,15 @@ def benchmarks(self) -> list[Benchmark]:
 
 
 class SyclBenchmark(Benchmark):
-    def __init__(self, bench, name, test):
-        super().__init__(bench)
-        self.bench = bench
+    def __init__(self, suite: SyclBench, name: str, test: str):
+        super().__init__(suite)
+        self.suite = suite
         self.bench_name = name
         self.test = test
 
     @property
     def benchmark_bin(self) -> Path:
-        return self.bench.project.build_dir / self.bench_name
+        return self.suite.project.build_dir / self.bench_name
 
     def enabled(self) -> bool:
         return options.sycl is not None
@@ -169,8 +169,8 @@ def run(
                             command=command,
                             env=env_vars,
                             unit="ms",
-                            git_url=self.bench.git_url(),
-                            git_hash=self.bench.git_hash(),
+                            git_url=self.suite.git_url(),
+                            git_hash=self.suite.git_hash(),
                         )
                     )
 
@@ -179,7 +179,7 @@ def run(
         return res_list
 
     def name(self):
-        return f"{self.bench.name()} {self.test}"
+        return f"{self.suite.name()} {self.test}"
 
     def teardown(self):
         return

devops/scripts/benchmarks/benches/umf.py

@@ -40,10 +40,9 @@ def benchmarks(self) -> list[Benchmark]:
 
 
 class GBench(Benchmark):
-    def __init__(self, bench):
-        super().__init__(bench)
+    def __init__(self, suite: UMFSuite):
+        super().__init__(suite)
 
-        self.bench = bench
         self.bench_name = "umf-benchmark"
 
         self.fragmentation_prefix = "FRAGMENTATION_"

devops/scripts/benchmarks/benches/velocity.py

@@ -57,20 +57,20 @@ def benchmarks(self) -> list[Benchmark]:
 
 
 class VelocityBase(Benchmark):
-    def __init__(self, name: str, bin_name: str, vb: VelocityBench, unit: str):
-        super().__init__(vb)
-        self.vb = vb
+    def __init__(self, suite: VelocityBench, name: str, bin_name: str, unit: str):
+        super().__init__(suite)
+        self.suite = suite
         self.bench_name = name
         self.bin_name = bin_name
         self.unit = unit
 
     @property
     def src_dir(self) -> Path:
-        return self.vb.project.src_dir / self.bench_name / "SYCL"
+        return self.suite.project.src_dir / self.bench_name / "SYCL"
 
     @property
     def build_dir(self) -> Path:
-        return self.vb.project.build_dir / self.bench_name
+        return self.suite.project.build_dir / self.bench_name
 
     @property
     def benchmark_bin(self) -> Path:
@@ -177,8 +177,8 @@ def run(
                 command=command,
                 env=env_vars,
                 unit=self.unit,
-                git_url=self.vb.git_url(),
-                git_hash=self.vb.git_hash(),
+                git_url=self.suite.git_url(),
+                git_hash=self.suite.git_hash(),
             )
         ]
 
@@ -187,8 +187,8 @@ def teardown(self):
 
 
 class Hashtable(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("hashtable", "hashtable_sycl", vb, "M keys/sec")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "hashtable", "hashtable_sycl", "M keys/sec")
 
     def name(self):
         return "Velocity-Bench Hashtable"
@@ -219,8 +219,8 @@ def get_tags(self):
 
 
 class Bitcracker(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("bitcracker", "bitcracker", vb, "s")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "bitcracker", "bitcracker", "s")
 
     def name(self):
         return "Velocity-Bench Bitcracker"
@@ -234,7 +234,7 @@ def description(self) -> str:
 
     def bin_args(self) -> list[str]:
         self.data_path = os.path.join(
-            self.vb.project.src_dir, "bitcracker", "hash_pass"
+            self.suite.project.src_dir, "bitcracker", "hash_pass"
         )
 
         return [
@@ -262,8 +262,8 @@ def get_tags(self):
 
 
 class SobelFilter(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("sobel_filter", "sobel_filter", vb, "ms")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "sobel_filter", "sobel_filter", "ms")
 
     def download_deps(self):
         self.download(
@@ -311,8 +311,8 @@ def get_tags(self):
 
 
 class QuickSilver(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("QuickSilver", "qs", vb, "MMS/CTT")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "QuickSilver", "qs", "MMS/CTT")
 
     def run(
         self,
@@ -344,7 +344,7 @@ def lower_is_better(self):
 
     def bin_args(self) -> list[str]:
         self.data_path = os.path.join(
-            self.vb.project.src_dir, "QuickSilver", "Examples", "AllScattering"
+            self.suite.project.src_dir, "QuickSilver", "Examples", "AllScattering"
         )
 
         return ["-i", f"{self.data_path}/scatteringOnly.inp"]
@@ -366,8 +366,8 @@ def get_tags(self):
 
 
 class Easywave(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("easywave", "easyWave_sycl", vb, "ms")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "easywave", "easyWave_sycl", "ms")
 
     def download_deps(self):
         self.download(
@@ -433,11 +433,11 @@ def get_tags(self):
 
 
 class CudaSift(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("cudaSift", "cudaSift", vb, "ms")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "cudaSift", "cudaSift", "ms")
 
     def download_deps(self):
-        images = os.path.join(self.vb.project.src_dir, self.bench_name, "inputData")
+        images = os.path.join(self.suite.project.src_dir, self.bench_name, "inputData")
         dest = os.path.join(options.workdir, "inputData")
         if not os.path.exists(dest):
             shutil.copytree(images, dest)
@@ -464,8 +464,8 @@ def get_tags(self):
 
 
 class DLCifar(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("dl-cifar", "dl-cifar_sycl", vb, "s")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "dl-cifar", "dl-cifar_sycl", "s")
 
     def ld_libraries(self):
         return get_oneapi().ld_libraries()
@@ -518,8 +518,8 @@ def get_tags(self):
 
 
 class DLMnist(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("dl-mnist", "dl-mnist-sycl", vb, "s")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "dl-mnist", "dl-mnist-sycl", "s")
 
     def ld_libraries(self):
         return get_oneapi().ld_libraries()
@@ -606,8 +606,8 @@ def get_tags(self):
 
 
 class SVM(VelocityBase):
-    def __init__(self, vb: VelocityBench):
-        super().__init__("svm", "svm_sycl", vb, "s")
+    def __init__(self, suite: VelocityBench):
+        super().__init__(suite, "svm", "svm_sycl", "s")
 
     def ld_libraries(self):
         return get_oneapi().ld_libraries()

devops/scripts/benchmarks/html/scripts.js

@@ -1790,14 +1790,15 @@ function fetchAndProcessData(url, isArchived = false) {
                 window.benchmarkMetadata = data.benchmarkMetadata || data.metadata || {};
                 window.benchmarkTags = data.benchmarkTags || data.tags || {};
                 window.flamegraphData = (data.flamegraphData && data.flamegraphData.runs) ? data.flamegraphData : { runs: {} };
-                if (Array.isArray(data.defaultCompareNames)) {
+                if (Array.isArray(data.defaultCompareNames) && (!defaultCompareNames || defaultCompareNames.length === 0)) {
                     defaultCompareNames = data.defaultCompareNames;
                 }
                 console.log('Remote data loaded (normalized):', {
                     runs: runsArray.length,
                     metadata: Object.keys(window.benchmarkMetadata).length,
                     tags: Object.keys(window.benchmarkTags).length,
-                    flamegraphs: Object.keys(window.flamegraphData.runs).length
+                    flamegraphs: Object.keys(window.flamegraphData.runs).length,
+                    defaultCompareNames: defaultCompareNames
                 });
             }
 

libc/include/endian.h.def

@@ -0,0 +1,17 @@
+//===-- POSIX header endian.h ---------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_ENDIAN_H
+#define LLVM_LIBC_ENDIAN_H
+
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/endian-macros.h"
+
+%%public_api()
+
+#endif // LLVM_LIBC_ENDIAN_H

libc/include/llvm-libc-macros/poll-macros.h

@@ -0,0 +1,16 @@
+//===-- Macros defined in poll.h header file ------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_MACROS_POLL_MACROS_H
+#define LLVM_LIBC_MACROS_POLL_MACROS_H
+
+#ifdef __linux__
+#include "linux/poll-macros.h"
+#endif
+
+#endif // LLVM_LIBC_MACROS_POLL_MACROS_H

libc/include/poll.h.def

@@ -0,0 +1,17 @@
+//===-- C standard library header poll.h ----------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_POLL_H
+#define LLVM_LIBC_POLL_H
+
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/poll-macros.h"
+
+%%public_api()
+
+#endif // LLVM_LIBC_POLL_H

libc/test/src/stdfix/countlsk_test.cpp

@@ -0,0 +1,13 @@
+//===-- Unittests for countlsk --------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "CountlsTest.h"
+
+#include "src/stdfix/countlsk.h"
+
+LIST_COUNTLS_TESTS(accum, LIBC_NAMESPACE::countlsk);