From 0426c361576f2ab9867e5aab75c2f307f059d116 Mon Sep 17 00:00:00 2001 From: Rafal Rudnicki Date: Thu, 23 Oct 2025 05:46:35 -0700 Subject: [PATCH 1/2] Revert "[Cuda] Disable tests since they're failed as llvm.nvvm intrinsics cannot be selected." This reverts commit c95e15fa26eb04237faaccd4acafa6236f428c71. --- sycl/test-e2e/AtomicRef/compare_exchange.cpp | 3 --- sycl/test-e2e/AtomicRef/compare_exchange_local.cpp | 2 -- sycl/test-e2e/AtomicRef/max.cpp | 3 --- sycl/test-e2e/AtomicRef/max_local.cpp | 3 --- sycl/test-e2e/AtomicRef/min.cpp | 3 --- sycl/test-e2e/AtomicRef/min_local.cpp | 3 --- sycl/test-e2e/BFloat16/bfloat16_vec.cpp | 3 --- sycl/test-e2e/Basic/code_location_e2e.cpp | 5 +---- sycl/test-e2e/Basic/compare_exchange_strong.cpp | 3 --- sycl/test-e2e/Basic/stream/auto_flush.cpp | 3 --- sycl/test-e2e/Basic/stream/release_resources_test.cpp | 3 --- sycl/test-e2e/Basic/stream/stream.cpp | 5 +---- sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp | 3 --- sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp | 3 --- sycl/test-e2e/Basic/stream/zero_buffer_size.cpp | 3 --- sycl/test-e2e/Basic/vector/scalar_access.cpp | 3 --- sycl/test-e2e/Complex/sycl_complex_stream_test.cpp | 3 --- sycl/test-e2e/Reduction/reduction_big_data.cpp | 3 --- sycl/test-e2e/Reduction/reduction_nd_ext_double.cpp | 3 --- sycl/test-e2e/Reduction/reduction_usm.cpp | 3 --- sycl/test-e2e/Reduction/reduction_usm_dw.cpp | 3 --- sycl/test-e2e/Regression/unoptimized_stream.cpp | 3 --- sycl/test-e2e/syclcompat/atomic/atomic_class.cpp | 2 -- 23 files changed, 2 insertions(+), 69 deletions(-) diff --git a/sycl/test-e2e/AtomicRef/compare_exchange.cpp b/sycl/test-e2e/AtomicRef/compare_exchange.cpp index 5b92e99fe58e6..9ad2500273df6 100644 --- a/sycl/test-e2e/AtomicRef/compare_exchange.cpp +++ b/sycl/test-e2e/AtomicRef/compare_exchange.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/AtomicRef/compare_exchange_local.cpp b/sycl/test-e2e/AtomicRef/compare_exchange_local.cpp index 168ab91e96877..aaf3a4fc5412f 100644 --- a/sycl/test-e2e/AtomicRef/compare_exchange_local.cpp +++ b/sycl/test-e2e/AtomicRef/compare_exchange_local.cpp @@ -1,5 +1,3 @@ -// UNSUPPORTED: target-nvidia, cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/AtomicRef/max.cpp b/sycl/test-e2e/AtomicRef/max.cpp index 7f5a3b62de8fa..810a3e425cd6a 100644 --- a/sycl/test-e2e/AtomicRef/max.cpp +++ b/sycl/test-e2e/AtomicRef/max.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/AtomicRef/max_local.cpp b/sycl/test-e2e/AtomicRef/max_local.cpp index 5932c9709c961..1be7a10826dc7 100644 --- a/sycl/test-e2e/AtomicRef/max_local.cpp +++ b/sycl/test-e2e/AtomicRef/max_local.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/AtomicRef/min.cpp b/sycl/test-e2e/AtomicRef/min.cpp index d028c96fdbee9..d4ab9f75b3ca0 100644 --- a/sycl/test-e2e/AtomicRef/min.cpp +++ b/sycl/test-e2e/AtomicRef/min.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/AtomicRef/min_local.cpp b/sycl/test-e2e/AtomicRef/min_local.cpp index b889e7ca9849d..0c003d0b048a2 100644 --- a/sycl/test-e2e/AtomicRef/min_local.cpp +++ b/sycl/test-e2e/AtomicRef/min_local.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/BFloat16/bfloat16_vec.cpp b/sycl/test-e2e/BFloat16/bfloat16_vec.cpp index 718e3cc13609e..8ff25b82c928a 100644 --- a/sycl/test-e2e/BFloat16/bfloat16_vec.cpp +++ b/sycl/test-e2e/BFloat16/bfloat16_vec.cpp @@ -6,9 +6,6 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %} diff --git a/sycl/test-e2e/Basic/code_location_e2e.cpp b/sycl/test-e2e/Basic/code_location_e2e.cpp index 6c274c964c0de..d90f3ef5b3e4f 100644 --- a/sycl/test-e2e/Basic/code_location_e2e.cpp +++ b/sycl/test-e2e/Basic/code_location_e2e.cpp @@ -1,8 +1,5 @@ -// UNSUPPORTED: target-nvidia,cuda +// UNSUPPORTED: cuda // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19214 -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -DNDEBUG -o %t1.out // RUN: %{run} %t1.out | FileCheck %s diff --git a/sycl/test-e2e/Basic/compare_exchange_strong.cpp b/sycl/test-e2e/Basic/compare_exchange_strong.cpp index 016f58619a66e..92e0a30f04d98 100644 --- a/sycl/test-e2e/Basic/compare_exchange_strong.cpp +++ b/sycl/test-e2e/Basic/compare_exchange_strong.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/stream/auto_flush.cpp b/sycl/test-e2e/Basic/stream/auto_flush.cpp index 4eb9a8e04bba2..f346eca5b72cf 100644 --- a/sycl/test-e2e/Basic/stream/auto_flush.cpp +++ b/sycl/test-e2e/Basic/stream/auto_flush.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out %if !gpu || linux %{ | FileCheck %s %} diff --git a/sycl/test-e2e/Basic/stream/release_resources_test.cpp b/sycl/test-e2e/Basic/stream/release_resources_test.cpp index c6890f3054396..bebcdffa25142 100644 --- a/sycl/test-e2e/Basic/stream/release_resources_test.cpp +++ b/sycl/test-e2e/Basic/stream/release_resources_test.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // UNSUPPORTED: windows // UNSUPPORTED-INTENDED: We can't safely release any resoureces on Windows, so // the test is expected to fail there. See comments in diff --git a/sycl/test-e2e/Basic/stream/stream.cpp b/sycl/test-e2e/Basic/stream/stream.cpp index bb81086d7ad71..3a676ae77baad 100644 --- a/sycl/test-e2e/Basic/stream/stream.cpp +++ b/sycl/test-e2e/Basic/stream/stream.cpp @@ -1,7 +1,4 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - -// UNSUPPORTED: target-nvidia,cuda +// UNSUPPORTED: cuda // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19214 // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out // RUN: %{run} %t.out %if !gpu || linux %{ | FileCheck %s %} diff --git a/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp b/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp index e3cabef1594db..3d8b854cb1e7e 100644 --- a/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp +++ b/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out %if !gpu || linux %{ | FileCheck %s %} diff --git a/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp b/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp index ab16fc5d0c7d5..61dbb196cac77 100644 --- a/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp +++ b/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out %if !gpu || linux %{ | FileCheck %s %} diff --git a/sycl/test-e2e/Basic/stream/zero_buffer_size.cpp b/sycl/test-e2e/Basic/stream/zero_buffer_size.cpp index 5d78ab277f730..283eb7f1204f2 100644 --- a/sycl/test-e2e/Basic/stream/zero_buffer_size.cpp +++ b/sycl/test-e2e/Basic/stream/zero_buffer_size.cpp @@ -4,9 +4,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - #include #include diff --git a/sycl/test-e2e/Basic/vector/scalar_access.cpp b/sycl/test-e2e/Basic/vector/scalar_access.cpp index aa8b5472f2d96..8b67b5fb8faeb 100644 --- a/sycl/test-e2e/Basic/vector/scalar_access.cpp +++ b/sycl/test-e2e/Basic/vector/scalar_access.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out | FileCheck %s diff --git a/sycl/test-e2e/Complex/sycl_complex_stream_test.cpp b/sycl/test-e2e/Complex/sycl_complex_stream_test.cpp index 2fc14881dd96e..eb5c98a7b3ba7 100644 --- a/sycl/test-e2e/Complex/sycl_complex_stream_test.cpp +++ b/sycl/test-e2e/Complex/sycl_complex_stream_test.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-finite-math-only%} %else %{-fno-finite-math-only%} // RUN: %{build} -Wno-error=deprecated-declarations -fsycl-device-code-split=per_kernel %{mathflags} -o %t.out diff --git a/sycl/test-e2e/Reduction/reduction_big_data.cpp b/sycl/test-e2e/Reduction/reduction_big_data.cpp index eb8f4d8c2a915..f13c3a274805a 100644 --- a/sycl/test-e2e/Reduction/reduction_big_data.cpp +++ b/sycl/test-e2e/Reduction/reduction_big_data.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // diff --git a/sycl/test-e2e/Reduction/reduction_nd_ext_double.cpp b/sycl/test-e2e/Reduction/reduction_nd_ext_double.cpp index 3eb9ec4b87e2f..7e7b9fac72ecf 100644 --- a/sycl/test-e2e/Reduction/reduction_nd_ext_double.cpp +++ b/sycl/test-e2e/Reduction/reduction_nd_ext_double.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Reduction/reduction_usm.cpp b/sycl/test-e2e/Reduction/reduction_usm.cpp index a1bbec1ad7ac4..ab69da3b521e2 100644 --- a/sycl/test-e2e/Reduction/reduction_usm.cpp +++ b/sycl/test-e2e/Reduction/reduction_usm.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Reduction/reduction_usm_dw.cpp b/sycl/test-e2e/Reduction/reduction_usm_dw.cpp index 29b1f01da935d..80fa4ad707cc7 100644 --- a/sycl/test-e2e/Reduction/reduction_usm_dw.cpp +++ b/sycl/test-e2e/Reduction/reduction_usm_dw.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Regression/unoptimized_stream.cpp b/sycl/test-e2e/Regression/unoptimized_stream.cpp index bee351764e12c..b107947ce5ea7 100644 --- a/sycl/test-e2e/Regression/unoptimized_stream.cpp +++ b/sycl/test-e2e/Regression/unoptimized_stream.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 - // RUN: %{build} %O0 -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp index cf9f863d188a6..abf5e7d5b9dc3 100644 --- a/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp +++ b/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp @@ -29,8 +29,6 @@ // // // ===----------------------------------------------------------------------===// -// UNSUPPORTED: target-nvidia,cuda -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20109 // UNSUPPORTED: target-amd || (windows && level_zero) From a96b1ae666f1fbc805093b3e0bcf3ccbd65482e4 Mon Sep 17 00:00:00 2001 From: Rafal Rudnicki Date: Thu, 23 Oct 2025 07:46:45 -0700 Subject: [PATCH 2/2] run CUDA tests with sm_75 --- .../conformance/device_code/CMakeLists.txt | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/unified-runtime/test/conformance/device_code/CMakeLists.txt b/unified-runtime/test/conformance/device_code/CMakeLists.txt index 1bc8ce784ca0e..05bb8e7b87e01 100644 --- a/unified-runtime/test/conformance/device_code/CMakeLists.txt +++ b/unified-runtime/test/conformance/device_code/CMakeLists.txt @@ -68,13 +68,17 @@ macro(add_device_binary SOURCE_FILE) set(BIN_PATH "${DEVICE_BINARY_DIR}/${TRIPLE}.bin.0") if(${TRIPLE} MATCHES "amd") - set(AMD_TARGET_BACKEND -Xsycl-target-backend=${TRIPLE}) - set(AMD_OFFLOAD_ARCH --offload-arch=${AMD_ARCH}) - set(AMD_NOGPULIB -nogpulib) + set(TARGET_BACKEND -Xsycl-target-backend=${TRIPLE}) + set(OFFLOAD_ARCH --offload-arch=${AMD_ARCH}) + set(NOGPULIB -nogpulib) + elseif(${TRIPLE} MATCHES "cuda") + set(TARGET_BACKEND -Xsycl-target-backend=${TRIPLE}) + set(OFFLOAD_ARCH --offload-arch=sm_75) + set(NOGPULIB -nogpulib) else() - set(AMD_TARGET_BACKEND) - set(AMD_OFFLOAD_ARCH) - set(AMD_NOGPULIB) + set(TARGET_BACKEND) + set(OFFLOAD_ARCH) + set(NOGPULIB) endif() # images are not yet supported in sycl on AMD if(${TRIPLE} MATCHES "amd" AND ${KERNEL_NAME} MATCHES "image_copy") @@ -107,8 +111,8 @@ macro(add_device_binary SOURCE_FILE) add_custom_command(OUTPUT ${BIN_PATH} COMMAND LD_LIBRARY_PATH=${UR_SYCL_LIBRARY_DIR}:$ENV{LD_LIBRARY_PATH} ${UR_FOUND_DPCXX} -fsycl -fsycl-targets=${TRIPLE} - -fsycl-device-code-split=off ${AMD_TARGET_BACKEND} - ${AMD_OFFLOAD_ARCH} ${AMD_NOGPULIB} ${DPCXX_BUILD_FLAGS_LIST} + -fsycl-device-code-split=off ${TARGET_BACKEND} + ${OFFLOAD_ARCH} ${NOGPULIB} ${DPCXX_BUILD_FLAGS_LIST} ${SOURCE_FILE} -o ${EXE_PATH} COMMAND ${CMAKE_COMMAND} -E env ${EXTRA_ENV} ${UR_FOUND_DEVICE_CODE_EXTRACTOR} -q --stem="${TRIPLE}.bin" ${EXE_PATH}