From 7146eecf977beae3ea6b35f7d88c254c21ff11d4 Mon Sep 17 00:00:00 2001 From: Alexey Sachkov Date: Fri, 20 Dec 2024 16:49:39 +0100 Subject: [PATCH 1/3] [SYCL][E2E] Use correct subtitution for `-O0` (#16440) On Windows clang tries to mimic `cl.exe` interface and it has a different spelling for `-O0` (`/Od`). Updated a couple of tests to make them work on Windows as well by using a substitution instead of a flag directly. --- sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp | 2 +- sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp b/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp index 988f014c2d8b4..1f61e1b4bec0f 100644 --- a/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp +++ b/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-1.cpp @@ -17,7 +17,7 @@ // UNSUPPORTED: cuda, hip // UNSUPPORTED-REASON: FP64 emulation is an Intel specific feature. -// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu -O0 %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu %O0 %s -o %t.out // RUN: %{run} %t.out // Tests that aspect::fp64 is not emitted correctly when -fsycl-fp64-conv-emu diff --git a/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp b/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp index 4dccf2f0f5a1b..eeb69159dd006 100644 --- a/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp +++ b/sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu-2.cpp @@ -20,7 +20,7 @@ // UNSUPPORTED: cuda, hip // UNSUPPORTED-REASON: FP64 emulation is an Intel specific feature. -// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu -O0 %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu %O0 %s -o %t.out // RUN: %{run} %t.out #include From fd7d6a11f92e296f5ee0737811070bb2d0fcc1ac Mon Sep 17 00:00:00 2001 From: Udit Kumar Agarwal Date: Fri, 20 Dec 2024 08:33:47 -0800 Subject: [PATCH 2/3] [SYCL][E2E] Replace `gpu-intel-dg1` with `arch-intel_gpu_dg1` LIT feature (#16432) So that the user won't have to manually specify `--param gpu-intel-dg1=True` to run tests on DG1. https://github.com/intel/llvm/pull/16220#discussion_r1865940378 --- sycl/test-e2e/Basic/build_log.cpp | 2 +- sycl/test-e2e/Basic/query.cpp | 2 +- sycl/test-e2e/ESIMD/dp4a.cpp | 2 +- .../InvokeSimd/Regression/ImplicitSubgroup/dp4a.cpp | 2 +- sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp | 2 +- sycl/test-e2e/README.md | 7 ------- sycl/test-e2e/lit.cfg.py | 2 -- 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sycl/test-e2e/Basic/build_log.cpp b/sycl/test-e2e/Basic/build_log.cpp index ae63b0bb5b287..69f039dde80db 100644 --- a/sycl/test-e2e/Basic/build_log.cpp +++ b/sycl/test-e2e/Basic/build_log.cpp @@ -1,5 +1,5 @@ // REQUIRES: opencl || level_zero, gpu, ocloc -// UNSUPPORTED: gpu-intel-dg1 +// UNSUPPORTED: arch-intel_gpu_dg1 // // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device dg1" %s -o %t.out // RUN: env SYCL_RT_WARNING_LEVEL=2 %{run} %t.out 2>&1 | FileCheck %s diff --git a/sycl/test-e2e/Basic/query.cpp b/sycl/test-e2e/Basic/query.cpp index 01576c78d2587..12a64a2e4452c 100644 --- a/sycl/test-e2e/Basic/query.cpp +++ b/sycl/test-e2e/Basic/query.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out -// REQUIRES: gpu-intel-dg1 +// REQUIRES: arch-intel_gpu_dg1 #include "query.hpp" diff --git a/sycl/test-e2e/ESIMD/dp4a.cpp b/sycl/test-e2e/ESIMD/dp4a.cpp index 129e7bdb702d6..0b99016d06a23 100644 --- a/sycl/test-e2e/ESIMD/dp4a.cpp +++ b/sycl/test-e2e/ESIMD/dp4a.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // TODO enable on Windows -// REQUIRES: linux && gpu-intel-dg1 +// REQUIRES: linux && arch-intel_gpu_dg1 // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/InvokeSimd/Regression/ImplicitSubgroup/dp4a.cpp b/sycl/test-e2e/InvokeSimd/Regression/ImplicitSubgroup/dp4a.cpp index 72bad9c621b8e..078a02eed1f9b 100644 --- a/sycl/test-e2e/InvokeSimd/Regression/ImplicitSubgroup/dp4a.cpp +++ b/sycl/test-e2e/InvokeSimd/Regression/ImplicitSubgroup/dp4a.cpp @@ -1,4 +1,4 @@ -// REQUIRES: gpu-intel-dg1 || gpu-intel-dg2 || arch-intel_gpu_pvc +// REQUIRES: arch-intel_gpu_dg1 || gpu-intel-dg2 || arch-intel_gpu_pvc // // Check that full compilation works: // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../dp4a.cpp -o %t.out diff --git a/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp b/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp index 15be55f7dde64..1b7a728a925a1 100644 --- a/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp +++ b/sycl/test-e2e/InvokeSimd/Regression/dp4a.cpp @@ -1,4 +1,4 @@ -// REQUIRES: gpu-intel-dg1 || gpu-intel-dg2 || arch-intel_gpu_pvc +// REQUIRES: arch-intel_gpu_dg1 || gpu-intel-dg2 || arch-intel_gpu_pvc // // Check that full compilation works: // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out diff --git a/sycl/test-e2e/README.md b/sycl/test-e2e/README.md index 1df9e685968f9..8ff9c53741ecb 100644 --- a/sycl/test-e2e/README.md +++ b/sycl/test-e2e/README.md @@ -242,7 +242,6 @@ place. No new tests should use these features: * **gpu-intel-gen11** - Intel GPU Gen11 availability; * **gpu-intel-gen12** - Intel GPU Gen12 availability; - * **gpu-intel-dg1** - Intel GPU DG1 availability; * **gpu-intel-dg2** - Intel GPU DG2 availability; * **gpu-intel-pvc** - Intel GPU PVC availability; * **gpu-intel-pvc-vg** - Intel GPU PVC-VG availability; @@ -268,12 +267,6 @@ configure specific single test execution in the command line: * **gpu_aot_target_opts** - defines additional options which are passed to AOT compilation command line for GPU device. It can be also set by CMake variable GPU_AOT_TARGET_OPTS. If not specified "-device *" value is used. - * **gpu-intel-dg1** - tells LIT infra that Intel GPU DG1 is present in the - system. It is developer / CI infra responsibility to make sure that the - device is available in the system. Tests requiring DG1 to run must use proper - device selector to ensure that. Use SYCL_DEVICE_ALLOWLIST or - ONEAPI_DEVICE_SELECTOR to get proper configuration (see - [EnvironmentVariables.md](https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md)); * **gpu-intel-dg2** - tells LIT infra that Intel GPU DG2 is present in the system. It is developer / CI infra responsibility to make sure that the device is available in the system. diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 9e1d2d903c058..a1da5ff46b5ff 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -168,8 +168,6 @@ config.available_features.add("gpu-intel-gen12") # Intel GPU DEVICE availability -if lit_config.params.get("gpu-intel-dg1", False): - config.available_features.add("gpu-intel-dg1") if lit_config.params.get("gpu-intel-dg2", False): config.available_features.add("gpu-intel-dg2") if lit_config.params.get("gpu-intel-pvc-vg", False): From 4fd899abc9a9938f1e33d21435e37d9d5948886d Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Sat, 21 Dec 2024 02:24:07 +0900 Subject: [PATCH 3/3] [SYCL][E2E] Remove XFAIL in get_coordinate_ops.cpp (#16444) It's passing now after the driver update. https://github.com/intel/llvm/actions/runs/12433578741/job/34716640805 Signed-off-by: Sarnie, Nick --- sycl/test-e2e/Matrix/get_coordinate_ops.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/sycl/test-e2e/Matrix/get_coordinate_ops.cpp b/sycl/test-e2e/Matrix/get_coordinate_ops.cpp index b32145b954422..ed404612a9ff3 100644 --- a/sycl/test-e2e/Matrix/get_coordinate_ops.cpp +++ b/sycl/test-e2e/Matrix/get_coordinate_ops.cpp @@ -6,9 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: aspect-ext_intel_matrix - -// XFAIL: !igc-dev -// XFAIL-TRACKER: GSD-6376 // REQUIRES-INTEL-DRIVER: lin: 30049 // RUN: %{build} -o %t.out