Merge pull request #781 from emankov/HIPIFY

[HIPIFY][SPARSE][tests] Sync with CUDA 12.0 - Part 32 - SPARSE tests only
ROCm · Feb 22, 2023 · f65494f · f65494f
2 parents 6f3d2fb + 16c04bb
commit f65494f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/tests/lit.cfg b/tests/lit.cfg
@@ -46,8 +46,10 @@ clang_arguments = "-v"
 if config.cuda_version_major == 7 and config.cuda_version_minor == 0:
     config.excludes.append('headers_test_09.cu')
     config.excludes.append('cudnn_convolution_forward.cu')
+
 if config.cuda_version_major < 8:
     config.excludes.append('cuSPARSE_02.cu')
+
 if config.cuda_version_major < 9:
     config.excludes.append('cuSPARSE_04.cu')
     config.excludes.append('cuSPARSE_05.cu')
@@ -58,20 +60,14 @@ if config.cuda_version_major < 9:
     config.excludes.append('cub_01.cu')
     config.excludes.append('cub_02.cu')
     config.excludes.append('cub_03.cu')
+
 if config.cuda_version_major < 10:
     config.excludes.append('cuSPARSE_08.cu')
     config.excludes.append('cuSPARSE_09.cu')
     config.excludes.append('cuSPARSE_10.cu')
     config.excludes.append('cuSPARSE_11.cu')
     config.excludes.append('simple_mechs.cu')
 
-if config.llvm_version_major < 8:
-    config.excludes.append('cd_intro.cu')
-
-if config.llvm_version_major < 10:
-    config.excludes.append('pp_if_else_conditionals_LLVM_10.cu')
-    config.excludes.append('pp_if_else_conditionals_01_LLVM_10.cu')
-
 if config.cuda_version_major > 10:
     clang_arguments += " -DTHRUST_IGNORE_CUB_VERSION_CHECK"
     config.excludes.append('cudnn_convolution_forward.cu')
@@ -94,6 +90,14 @@ if config.cuda_version_major >= 12:
     config.excludes.append('headers_test_08.cu')
     config.excludes.append('headers_test_09.cu')
     config.excludes.append('tex2dKernel.cpp')
+    config.excludes.append('cuSPARSE_11.cu')
+
+if config.llvm_version_major < 8:
+    config.excludes.append('cd_intro.cu')
+
+if config.llvm_version_major < 10:
+    config.excludes.append('pp_if_else_conditionals_LLVM_10.cu')
+    config.excludes.append('pp_if_else_conditionals_01_LLVM_10.cu')
 
 # name: The name of this test suite.
 config.name = 'hipify'

diff --git a/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu b/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
@@ -159,6 +159,7 @@ int main(int argc, char*argv[])
   assert(CUSPARSE_STATUS_SUCCESS == status);
 
   /* step 5: gather sorted cooVals */
+#if CUDA_VERSION < 12000
   // CHECK: status = hipsparseDgthr(
   // CHECK: HIPSPARSE_INDEX_BASE_ZERO
   status = cusparseDgthr(
@@ -169,6 +170,8 @@ int main(int argc, char*argv[])
     d_P,
     CUSPARSE_INDEX_BASE_ZERO
   );
+#endif
+
   // CHECK: assert(HIPSPARSE_STATUS_SUCCESS == status);
   assert(CUSPARSE_STATUS_SUCCESS == status);
   /* wait until the computation is done */