Address PR comments

codeplaysoftware · May 7, 2024 · 2f46c4d · 2f46c4d
1 parent 0e96539
commit 2f46c4d
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
@@ -77,7 +77,7 @@ if(is_adaptivecpp)
   # Skip these tests for AdaptiveCpp for SPIRV/OpenCL targets
   # that use SYCL 2020 features like group reduction or hang
   # during execution (https://github.com/AdaptiveCpp/AdaptiveCpp/issues/1309)
-  set(TEST_TO_SKIP
+  set(TESTS_TO_SKIP
     ${PORTBLAS_UNITTEST}/blas1/blas1_asum_test.cpp
     ${PORTBLAS_UNITTEST}/blas1/blas1_sdsdot_test.cpp
     ${PORTBLAS_UNITTEST}/blas1/blas1_nrm2_test.cpp
@@ -104,10 +104,8 @@ if(is_dpcpp)
 endif()
 
 if(is_dpcpp AND ${TUNING_TARGET} STREQUAL "DEFAULT")
-  string(REGEX MATCH "nvidia_gpu" is_nvidia ${DPCPP_SYCL_TARGET})
-  string(REGEX MATCH "amd_gpu" is_amd ${DPCPP_SYCL_TARGET})
-  if (${DPCPP_SYCL_TARGET} STREQUAL "nvptx64-nvidia-cuda" OR is_nvidia STREQUAL "nvidia_gpu")
-    set(TEST_TO_SKIP
+  if (${DPCPP_SYCL_TARGET} MATCHES "nvidia")
+    set(TESTS_TO_SKIP
       ${PORTBLAS_UNITTEST}/blas1/blas1_iamax_test.cpp
       ${PORTBLAS_UNITTEST}/blas1/blas1_iamin_test.cpp
       ${PORTBLAS_UNITTEST}/blas2/blas2_tbsv_test.cpp
@@ -117,8 +115,8 @@ if(is_dpcpp AND ${TUNING_TARGET} STREQUAL "DEFAULT")
       )
     message(WARNING "Targetting NVIDIA hardware with DEFAULT TUNING_TARGET.
     Disabling tests for following operators: iamax, iamin, trsv, tbsv, tpsv, trsm.")
-  elseif(${DPCPP_SYCL_TARGET} STREQUAL "amdgcn-amd-amdhsa" OR is_amd STREQUAL "amd_gpu")
-    set(TEST_TO_SKIP
+  elseif (${DPCPP_SYCL_TARGET} MATCHES "amd")
+    set(TESTS_TO_SKIP
       ${PORTBLAS_UNITTEST}/blas1/blas1_iamax_test.cpp
       ${PORTBLAS_UNITTEST}/blas1/blas1_iamin_test.cpp
       ${PORTBLAS_UNITTEST}/blas2/blas2_tbsv_test.cpp
@@ -141,7 +139,7 @@ set(HALF_DATA_OPS "blas1_axpy_test"
                   )
 
 foreach(blas_test ${SYCL_UNITTEST_SRCS})
-  if(${blas_test} IN_LIST TEST_TO_SKIP)
+  if(${blas_test} IN_LIST TESTS_TO_SKIP)
     continue()
   endif()
   get_filename_component(test_exec ${blas_test} NAME_WE)