Merge from 'sycl' to 'sycl-web' (2 commits)

iclsrc · iclsrc · commit 071edb119fee · 2025-05-21T08:38:05.000-07:00
diff --git a/devops/dependencies.json b/devops/dependencies.json
@@ -1,15 +1,15 @@
 {
   "linux": {
     "compute_runtime": {
-      "github_tag": "25.09.32961.7",
-      "version": "25.09.32961.7",
-      "url": "https://github.com/intel/compute-runtime/releases/tag/25.09.32961.7",
+      "github_tag": "25.13.33276.19",
+      "version": "25.13.33276.19",
+      "url": "https://github.com/intel/compute-runtime/releases/tag/25.13.33276.19",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "igc": {
-      "github_tag": "v2.8.3",
-      "version": "v2.8.3",
-      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.8.3",
+      "github_tag": "v2.10.10",
+      "version": "v2.10.10",
+      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.10.10",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "cm": {
diff --git a/devops/scripts/benchmarks/benches/gromacs.py b/devops/scripts/benchmarks/benches/gromacs.py
@@ -77,7 +77,7 @@ def setup(self):
                 f"-DGMX_SYCL_ENABLE_EXPERIMENTAL_SUBMIT_API=ON",
                 f"-DGMX_FFT_LIBRARY=MKL",
                 f"-DGMX_GPU_FFT_LIBRARY=MKL",
-                f"-DMKL_DIR={self.oneapi.mkl_cmake()}",
+                f"-DMKLROOT={self.oneapi.mkl_dir()}",
                 f"-DGMX_GPU_NB_CLUSTER_SIZE=8",
                 f"-DGMX_GPU_NB_NUM_CLUSTER_PER_CELL_X=1",
                 f"-DGMX_OPENMP=OFF",
diff --git a/devops/scripts/benchmarks/utils/oneapi.py b/devops/scripts/benchmarks/utils/oneapi.py
@@ -55,6 +55,9 @@ def package_cmake(self, package):
         package_lib = self.package_dir(package, "lib")
         return os.path.join(package_lib, "cmake", package)
 
+    def mkl_dir(self):
+        return self.package_dir("mkl", "")
+
     def mkl_lib(self):
         return self.package_dir("mkl", "lib")
 
diff --git a/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp b/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp
@@ -4,6 +4,9 @@
 // XFAIL: gpu-intel-pvc-1T
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699
 
+// XFAIL: linux && run-mode && (arch-intel_gpu_bmg_g21 || gpu-intel-dg2)
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576
+
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out
 
 // TODO: at this time PVC 1T systems are not correctly supporting CSLICE
diff --git a/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp b/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp
@@ -4,6 +4,9 @@
 // XFAIL: gpu-intel-pvc-1T
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699
 
+// XFAIL: linux && run-mode && (arch-intel_gpu_bmg_g21 || gpu-intel-dg2)
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576
+
 // RUN: %{build} -o %t.out
 
 // TODO: at this time PVC 1T systems are not correctly supporting CSLICE
diff --git a/sycl/test-e2e/Adapters/sycl-ls-uuid-subdevs.cpp b/sycl/test-e2e/Adapters/sycl-ls-uuid-subdevs.cpp
@@ -2,6 +2,9 @@
  * devices. */
 // REQUIRES:  gpu, level_zero
 
+// XFAIL: linux && run-mode && (arch-intel_gpu_bmg_g21 || gpu-intel-dg2)
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576
+
 // As of now, ZEX_NUMBER_OF_CCS is not working with FLAT hierachy,
 // which is the new default on PVC.
 
diff --git a/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp b/sycl/test-e2e/Graph/Explicit/add_nodes_after_finalize.cpp
@@ -5,8 +5,8 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 
-// Test is flaky on Windows, disable until it can be fixed
-// UNSUPPORTED: windows
+// Test is flaky on Windows and Linux DG2, disable until it can be fixed
+// UNSUPPORTED: windows || gpu-intel-dg2
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/11852
 
 #define GRAPH_E2E_EXPLICIT
diff --git a/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp b/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp
@@ -1,3 +1,5 @@
+// XFAIL: run-mode && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18579
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp
@@ -1,3 +1,5 @@
+// XFAIL: run-mode && gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18579
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
diff --git a/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp b/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp
@@ -1,6 +1,8 @@
 // REQUIRES: sg-8
 // UNSUPPORTED: target-nvidia || target-amd
 // UNSUPPORTED-INTENDED: subgroup size requirement implicitly make nvptx/amdgcn
+// XFAIL: linux && run-mode && (gpu-intel-gen12 || gpu-intel-dg2)
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18577
 // not supported
 
 // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp
@@ -8,8 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode && gpu
-// XFAIL-TRACKER: CMPLRLLVM-66371
 // REQUIRES: aspect-ext_intel_matrix
 
 // RUN: %{build} -o %t_vnni.out -DVNNI %fp-model-precise
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp
@@ -8,7 +8,7 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode
+// XFAIL: run-mode && gpu-intel-dg2
 // XFAIL-TRACKER: CMPLRLLVM-66371
 
 // REQUIRES: aspect-ext_intel_matrix, gpu
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp
@@ -8,9 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode && gpu
-// XFAIL-TRACKER: CMPLRLLVM-66371
-
 // REQUIRES: aspect-ext_intel_matrix
 
 // RUN: %{build} -o %t_arg_dim_vnni.out %fp-model-precise -DARG_DIM -DVNNI
@@ -22,8 +19,6 @@
 // test.
 // XFAIL: gpu-intel-dg2 && run-mode
 // XFAIL-TRACKER: GSD-10510
-// XFAIL: arch-intel_gpu_bmg_g21
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16922
 
 #include "common.hpp"
 #include "joint_matrix_bf16_fill_k_cache_impl.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp
@@ -8,8 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode
-// XFAIL-TRACKER: CMPLRLLVM-66371
 
 // REQUIRES: aspect-ext_intel_matrix, gpu
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp
@@ -8,8 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode && gpu
-// XFAIL-TRACKER: CMPLRLLVM-66371
 
 // REQUIRES: aspect-ext_intel_matrix
 // UNSUPPORTED: gpu-intel-dg2
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp
@@ -8,8 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode && gpu
-// XFAIL-TRACKER: CMPLRLLVM-66371
 
 // REQUIRES: aspect-ext_intel_matrix
 
@@ -22,8 +20,6 @@
 // test.
 // XFAIL: gpu-intel-dg2 && run-mode
 // XFAIL-TRACKER: GSD-10510
-// XFAIL: arch-intel_gpu_bmg_g21
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16922
 
 #include "common.hpp"
 #include "joint_matrix_bf16_fill_k_cache_impl.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp
@@ -8,8 +8,6 @@
 // UNSUPPORTED: target-nvidia, target-amd
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
-// XFAIL: run-mode && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21)
-// XFAIL-TRACKER: CMPLRLLVM-66371
 
 // REQUIRES: aspect-ext_intel_matrix
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp
@@ -9,9 +9,6 @@
 // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for
 // other triples
 
-// XFAIL: run-mode && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21)
-// XFAIL-TRACKER: CMPLRLLVM-66371
-
 // REQUIRES: aspect-ext_intel_matrix, gpu
 
 // RUN: %{build} -mllvm -inline-threshold=2000 %fp-model-precise -o %t_gpu.out -DINIT_LIST -DMANUAL_UNROLL -DVNNI
diff --git a/sycl/test-e2e/MemorySanitizer/check_large_access.cpp b/sycl/test-e2e/MemorySanitizer/check_large_access.cpp
@@ -9,9 +9,6 @@
 // XFAIL: spirv-backend
 // XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/122075
 
-// XFAIL: gpu && level_zero
-// XFAIL-TRACKER: GSD-11065
-
 #include "sycl/detail/core.hpp"
 #include <sycl/vector.hpp>
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// XFAIL: run-mode && gpu-intel-dg2`
	`2`	`+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18579`
`1`	`3`	`// RUN: %{build} -o %t.out`
`2`	`4`	`// RUN: %{run} %t.out`
`3`	`5`	`// Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG`