From 4252f833f603588f6d4472172499fa716db8e63c Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 8 Feb 2024 15:17:50 -0800 Subject: [PATCH 01/14] Enable FPGA on precommit --- .github/workflows/sycl-linux-precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 61abda9de327a..c82720f1c8078 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -64,7 +64,7 @@ jobs: runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN - target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu + target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu;opencl:acc reset_gpu: true install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }} extra_lit_opts: --param gpu-intel-gen12=True From b17de98594ef96b13ea9865fb4799746563c416f Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 8 Feb 2024 15:39:23 -0800 Subject: [PATCH 02/14] Fix --- .github/workflows/sycl-linux-precommit.yml | 2 +- .github/workflows/sycl-linux-run-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index c82720f1c8078..f0f9641e73f12 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -64,7 +64,7 @@ jobs: runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN - target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu;opencl:acc + target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu;opencl:fpga reset_gpu: true install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }} extra_lit_opts: --param gpu-intel-gen12=True diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 639c788c7fbd3..59ffe39325b8e 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -100,7 +100,7 @@ on: options: - 'opencl:cpu' - 'opencl:gpu' - - 'opencl:acc' + - 'opencl:fpga' - 'ext_oneapi_level_zero:gpu' - 'ext_oneapi_hip:gpu' tests_selector: From 87f717f43bd4e930d583234ca0c4edd6cdf22eed Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 8 Feb 2024 15:40:40 -0800 Subject: [PATCH 03/14] Fix --- sycl/test-e2e/lit.cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index a25f775edc9e1..ef44dc972797b 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -669,7 +669,7 @@ features.update(sg_size_features) be, dev = sycl_device.split(":") - features.add(dev.replace("acc", "accelerator")) + features.add(dev.replace("fpga", "accelerator")) # Use short names for LIT rules. features.add(be) From 381e5573cdf37ddf70c922e678b3f5fd9c4113d7 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 8 Feb 2024 22:51:50 -0800 Subject: [PATCH 04/14] Disable tests on acc --- sycl/test-e2e/Assert/assert_in_kernels.cpp | 2 ++ sycl/test-e2e/Assert/assert_in_multiple_tus.cpp | 2 ++ sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp | 2 ++ sycl/test-e2e/Assert/assert_in_one_kernel.cpp | 2 ++ sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp | 2 ++ .../test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp | 2 ++ sycl/test-e2e/DeviceLib/string_test.cpp | 4 +++- .../Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp | 2 ++ sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp | 2 ++ sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp | 2 ++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp index aec66106d7bba..eb0a9805245d2 100644 --- a/sycl/test-e2e/Assert/assert_in_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp @@ -3,6 +3,8 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index 062f5952236ad..e96d389047047 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -6,6 +6,8 @@ // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp index 1bf2ecdc98418..5bbb5925b1104 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -6,6 +6,8 @@ // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp index 4ab0c382e8b43..0690551fc4851 100644 --- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp +++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp @@ -3,6 +3,8 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp index f6edc754960d9..2676e06f3e01b 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp @@ -3,6 +3,8 @@ // UNSUPPORTED: hip || cuda // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp index 582dc0cfbe66e..0c6648369a07d 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -1,6 +1,8 @@ // FIXME flaky fail on CUDA and HIP // UNSUPPORTED: cuda || hip // +// UNSUPPORTED: accelerator +// // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index be4e7ed38ca27..f6beadddc8681 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,7 +1,9 @@ // UNSUPPORTED: hip // RUN: %{build} -fno-builtin -o %t.out // RUN: %{run} %t.out - +// +// UNSUPPORTED: accelerator +// // RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out // RUN: %if !gpu %{ %{run} %t.out %} diff --git a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp index b20ee36448ef0..d0386fc632200 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp @@ -1,5 +1,7 @@ // REQUIRES: gpu-intel-gen12 +// UNSUPPORTED: accelerator + // RUN: %{build} -o %t.out -DSYCL_EXT_ONEAPI_MATRIX_VERSION=4 // RUN: %{run} %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp index 002621de9bfeb..af01b12638103 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp @@ -32,6 +32,8 @@ // UNSUPPORTED: hip +// UNSUPPORTED: accelerator + // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp index 9dc513ae5a86a..30b26acd7d48b 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp @@ -32,6 +32,8 @@ // UNSUPPORTED: hip +// UNSUPPORTED: accelerator + // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out // RUN: %{run} %t.out From 8b6a0aa0cf7348121fbb1e6c5e95af444e5cc59e Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 9 Feb 2024 08:13:03 -0800 Subject: [PATCH 05/14] Revert change. --- sycl/test-e2e/lit.cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index ef44dc972797b..a25f775edc9e1 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -669,7 +669,7 @@ features.update(sg_size_features) be, dev = sycl_device.split(":") - features.add(dev.replace("fpga", "accelerator")) + features.add(dev.replace("acc", "accelerator")) # Use short names for LIT rules. features.add(be) From ad07e97a32ed230f85b5b2b5520b5c5c9aff2d64 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 9 Feb 2024 11:55:23 -0800 Subject: [PATCH 06/14] Add comments --- sycl/test-e2e/Assert/assert_in_kernels.cpp | 2 +- sycl/test-e2e/Assert/assert_in_multiple_tus.cpp | 2 +- sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp | 2 +- sycl/test-e2e/Assert/assert_in_one_kernel.cpp | 2 +- sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp | 2 +- sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp | 2 +- sycl/test-e2e/DeviceLib/string_test.cpp | 2 +- .../Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp | 2 +- sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp | 2 +- sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp index eb0a9805245d2..b7625b0ba5551 100644 --- a/sycl/test-e2e/Assert/assert_in_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp @@ -2,7 +2,7 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index e96d389047047..f3c38522d981e 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -5,7 +5,7 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp index 5bbb5925b1104..a2bb6afd79161 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -5,7 +5,7 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp index 0690551fc4851..794afcb2f9de1 100644 --- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp +++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp @@ -2,7 +2,7 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp index 2676e06f3e01b..95c6a9547acd1 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp @@ -2,7 +2,7 @@ // FIXME: Flaky on HIP and cuda // UNSUPPORTED: hip || cuda // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp index 0c6648369a07d..2fd6ecd24092c 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -1,6 +1,6 @@ // FIXME flaky fail on CUDA and HIP // UNSUPPORTED: cuda || hip -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index f6beadddc8681..12d201214f96b 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: hip // RUN: %{build} -fno-builtin -o %t.out // RUN: %{run} %t.out -// +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out diff --git a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp index d0386fc632200..ce8b9fa4d6351 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp @@ -1,5 +1,5 @@ // REQUIRES: gpu-intel-gen12 - +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %{build} -o %t.out -DSYCL_EXT_ONEAPI_MATRIX_VERSION=4 diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp index af01b12638103..2b64c839bed74 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp @@ -31,7 +31,7 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip - +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp index 30b26acd7d48b..cba48c598eb9b 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp @@ -31,7 +31,7 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip - +// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out From 2b0412291950519161083542a671a8e2362d1463 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 9 Feb 2024 12:01:28 -0800 Subject: [PATCH 07/14] clang format --- sycl/test-e2e/Assert/assert_in_kernels.cpp | 3 ++- sycl/test-e2e/Assert/assert_in_multiple_tus.cpp | 3 ++- sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp | 3 ++- sycl/test-e2e/Assert/assert_in_one_kernel.cpp | 3 ++- sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp | 3 ++- sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp | 3 ++- sycl/test-e2e/DeviceLib/string_test.cpp | 3 ++- .../Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp | 3 ++- sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp | 3 ++- sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp index b7625b0ba5551..189b112b73cb5 100644 --- a/sycl/test-e2e/Assert/assert_in_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp @@ -2,7 +2,8 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index f3c38522d981e..f618ac93bb926 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -5,7 +5,8 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp index a2bb6afd79161..465330d2607c9 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -5,7 +5,8 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp index 794afcb2f9de1..0301d966abfc8 100644 --- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp +++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp @@ -2,7 +2,8 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp index 95c6a9547acd1..5262de611e89d 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp @@ -2,7 +2,8 @@ // FIXME: Flaky on HIP and cuda // UNSUPPORTED: hip || cuda // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp index 2fd6ecd24092c..c73b6647ae5f0 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -1,6 +1,7 @@ // FIXME flaky fail on CUDA and HIP // UNSUPPORTED: cuda || hip -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index 12d201214f96b..9d7627dbfe0f5 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,7 +1,8 @@ // UNSUPPORTED: hip // RUN: %{build} -fno-builtin -o %t.out // RUN: %{run} %t.out -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // // RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out diff --git a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp index ce8b9fa4d6351..9985908cf7f6b 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp @@ -1,5 +1,6 @@ // REQUIRES: gpu-intel-gen12 -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %{build} -o %t.out -DSYCL_EXT_ONEAPI_MATRIX_VERSION=4 diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp index 2b64c839bed74..bc76896889554 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp @@ -31,7 +31,8 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp index cba48c598eb9b..276f893af4341 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp @@ -31,7 +31,8 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing https://github.com/intel/llvm/issues/12683 +// TODO: Remove unsupported after fixing +// https://github.com/intel/llvm/issues/12683 // UNSUPPORTED: accelerator // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out From afb59c4f05562283398c2e5d6ae93647f9417cfe Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Mon, 12 Feb 2024 11:10:45 -0800 Subject: [PATCH 08/14] Fix --- .../joint_matrix_opt_kernel_feature_unsupported_hw.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp index 9985908cf7f6b..c041616e7db84 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_opt_kernel_feature_unsupported_hw.cpp @@ -1,7 +1,4 @@ -// REQUIRES: gpu-intel-gen12 -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator +// REQUIRES: gpu-intel-gen12, gpu // RUN: %{build} -o %t.out -DSYCL_EXT_ONEAPI_MATRIX_VERSION=4 // RUN: %{run} %t.out From 29e31c62bfc779294704e5550ea56897053f5ada Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Tue, 13 Feb 2024 12:09:13 -0800 Subject: [PATCH 09/14] Fix --- sycl/test-e2e/Assert/assert_in_kernels.cpp | 5 +---- sycl/test-e2e/Assert/assert_in_multiple_tus.cpp | 5 +---- sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp | 5 +---- sycl/test-e2e/Assert/assert_in_one_kernel.cpp | 5 +---- sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp | 5 +---- .../Assert/assert_in_simultaneously_multiple_tus.cpp | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp index 189b112b73cb5..52d019b805ce0 100644 --- a/sycl/test-e2e/Assert/assert_in_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp @@ -2,16 +2,13 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // // CHECK-NOT: One shouldn't see this message // CHECK: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0] diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index f618ac93bb926..f37f38c176acf 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -5,15 +5,12 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // Shouldn't fail on ACC as fallback assert isn't enqueued there // // CUDA uses block/thread vs global/local id for SYCL, also it shows the diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp index 465330d2607c9..5ef723c06bed4 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -5,16 +5,13 @@ // // https://github.com/intel/llvm/issues/8832 // UNSUPPORTED: cuda -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%{sycl_triple} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // // CHECK-NOT: this message from calculus // CUDA uses block/thread vs global/local id for SYCL, also it shows the diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp index 0301d966abfc8..14e812516ad4d 100644 --- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp +++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp @@ -2,16 +2,13 @@ // https://github.com/intel/llvm/issues/7634 // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // // CHECK: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0] // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp index 5262de611e89d..8339171c76b38 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp @@ -2,9 +2,6 @@ // FIXME: Flaky on HIP and cuda // UNSUPPORTED: hip || cuda // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) @@ -20,7 +17,7 @@ // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // // CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:13: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0] // CHECK-SAME: Assertion `false && "from assert statement"` failed diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp index c73b6647ae5f0..a88a9d7ae98f5 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -1,8 +1,5 @@ // FIXME flaky fail on CUDA and HIP // UNSUPPORTED: cuda || hip -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator // // FIXME: Remove XFAIL one intel/llvm#11364 is resolved // XFAIL: (opencl && gpu) @@ -20,7 +17,7 @@ // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %} +// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} // // CHECK: {{this message from file1|this message from file2}} // CHECK-NOT: The test ended. From 3a5a1e06536fccb32dfe4cca238ab7e984287f2c Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Tue, 13 Feb 2024 14:38:18 -0800 Subject: [PATCH 10/14] Fix --- sycl/test-e2e/Assert/assert_in_kernels.cpp | 2 +- sycl/test-e2e/Assert/assert_in_multiple_tus.cpp | 2 +- sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp | 2 +- sycl/test-e2e/Assert/assert_in_one_kernel.cpp | 2 +- sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp | 2 +- sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp index 52d019b805ce0..6321896701fb9 100644 --- a/sycl/test-e2e/Assert/assert_in_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp @@ -8,7 +8,7 @@ // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // // CHECK-NOT: One shouldn't see this message // CHECK: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0] diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index f37f38c176acf..0ea8069a36245 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -10,7 +10,7 @@ // XFAIL: (opencl && gpu) // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // Shouldn't fail on ACC as fallback assert isn't enqueued there // // CUDA uses block/thread vs global/local id for SYCL, also it shows the diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp index 5ef723c06bed4..017d0ba462322 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -11,7 +11,7 @@ // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%{sycl_triple} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // // CHECK-NOT: this message from calculus // CUDA uses block/thread vs global/local id for SYCL, also it shows the diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp index 14e812516ad4d..cf5b5875f77d3 100644 --- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp +++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp @@ -8,7 +8,7 @@ // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // // CHECK: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0] // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp index 8339171c76b38..49dd89f0a2a9f 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp @@ -17,7 +17,7 @@ // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // // CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:13: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0] // CHECK-SAME: Assertion `false && "from assert statement"` failed diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp index a88a9d7ae98f5..e95be2322c3f2 100644 --- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -17,7 +17,7 @@ // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if accelerator %{ --check-prefix=CHECK-ACC %} +// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %} // // CHECK: {{this message from file1|this message from file2}} // CHECK-NOT: The test ended. From 487ef12533c1f1df937670742be8c1a4da2b7caa Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 15 Feb 2024 10:14:11 -0800 Subject: [PATCH 11/14] Fix syclcompat/atomic tests --- sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp | 5 +---- sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp index bc76896889554..3b2a53016c7e1 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp @@ -31,11 +31,8 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator -// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out +// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} -fsycl-device-code-split=per_kernel %s -o %t.out // RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp index 276f893af4341..f180e3f535340 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp @@ -31,11 +31,8 @@ // ===----------------------------------------------------------------------===// // UNSUPPORTED: hip -// TODO: Remove unsupported after fixing -// https://github.com/intel/llvm/issues/12683 -// UNSUPPORTED: accelerator -// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out +// RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} -fsycl-device-code-split=per_kernel %s -o %t.out // RUN: %{run} %t.out #include From 59e81bdcf9c608c37adb40658d1cb5d206fde184 Mon Sep 17 00:00:00 2001 From: Udit Agarwal <16324601+uditagarwal97@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:12:06 -0800 Subject: [PATCH 12/14] disable fpga from sycl-linux-precommit.yml --- .github/workflows/sycl-linux-precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index f0f9641e73f12..61abda9de327a 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -64,7 +64,7 @@ jobs: runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN - target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu;opencl:fpga + target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu reset_gpu: true install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }} extra_lit_opts: --param gpu-intel-gen12=True From dbe8a966744600516e3f3d4711ea0a3c53205766 Mon Sep 17 00:00:00 2001 From: Udit Agarwal <16324601+uditagarwal97@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:13:04 -0800 Subject: [PATCH 13/14] Enable fpga in sycl-post-commit.yml --- .github/workflows/sycl-post-commit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index dc21752d712bf..aaf36263a93a9 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -45,6 +45,7 @@ jobs: - name: Intel GEN12 Graphics with Level Zero runner: '["Linux", "gen12"]' extra_lit_opts: --param gpu-intel-gen12=True + target_devices: ext_oneapi_level_zero:gpu;opencl:fpga - name: Intel Arc A-Series Graphics with Level Zero runner: '["Linux", "arc"]' extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True From 04cbcce463e333b54c7c3b941e4f99d3976535e4 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Mon, 19 Feb 2024 21:27:36 -0800 Subject: [PATCH 14/14] Add comment to syclcompat tests. --- sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp | 2 ++ sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp index 3b2a53016c7e1..bbd406a35e69e 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_arith.cpp @@ -32,6 +32,8 @@ // UNSUPPORTED: hip +// FIXME: Remove "-fsycl-device-code-split=per_kernel" option after fixing +// https://github.com/intel/llvm/issues/12743. // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} -fsycl-device-code-split=per_kernel %s -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp index f180e3f535340..b315816034a51 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_comp_exchange.cpp @@ -32,6 +32,8 @@ // UNSUPPORTED: hip +// FIXME: Remove "-fsycl-device-code-split=per_kernel" option after fixing +// https://github.com/intel/llvm/issues/12743. // RUN: %clangxx -std=c++20 -fsycl -fsycl-targets=%{sycl_triple} -fsycl-device-code-split=per_kernel %s -o %t.out // RUN: %{run} %t.out