[HIPIFY][6.0.0][hipSPARSE][fix] Support for ROCm HIP 6.0.0 - Step 29 …

…- hipSPARSE + Updated synthetic tests, the regenerated hipify-perl, and SPARSE docs + [fix] Added missing APIs [TODO] + Mark as `C-Changed` in CUDA 12000: `cusparseSpGEMMreuse_nnz`, `cusparseSpGEMMreuse_compute`, `cusparseSpGEMMreuse_copy`, `cusparseSDDMM_bufferSize`, `cusparseSDDMM_preprocess`, `cusparseSDDMM`
emankov · Oct 28, 2023 · 54b1078 · 54b1078
1 parent 2d8b44e
commit 54b1078
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 27 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
@@ -3886,6 +3886,9 @@ sub simpleSubstitutions {
     subst("cusparseSpGEMM_createDescr", "hipsparseSpGEMM_createDescr", "library");
     subst("cusparseSpGEMM_destroyDescr", "hipsparseSpGEMM_destroyDescr", "library");
     subst("cusparseSpGEMM_workEstimation", "hipsparseSpGEMM_workEstimation", "library");
+    subst("cusparseSpGEMMreuse_compute", "hipsparseSpGEMMreuse_compute", "library");
+    subst("cusparseSpGEMMreuse_copy", "hipsparseSpGEMMreuse_copy", "library");
+    subst("cusparseSpGEMMreuse_nnz", "hipsparseSpGEMMreuse_nnz", "library");
     subst("cusparseSpGEMMreuse_workEstimation", "hipsparseSpGEMMreuse_workEstimation", "library");
     subst("cusparseSpMM", "hipsparseSpMM", "library");
     subst("cusparseSpMM_bufferSize", "hipsparseSpMM_bufferSize", "library");
@@ -6830,9 +6833,6 @@ sub warnUnsupportedFunctions {
         "cusparseSpMMOpPlan",
         "cusparseSpMMOpAlg_t",
         "cusparseSpMMOp",
-        "cusparseSpGEMMreuse_nnz",
-        "cusparseSpGEMMreuse_copy",
-        "cusparseSpGEMMreuse_compute",
         "cusparseSpGEMM_getNumProducts",
         "cusparseSpGEMM_estimateMemory",
         "cusparseSolveAnalysisInfo_t",

diff --git a/docs/tables/CUSPARSE_API_supported_by_HIP.md b/docs/tables/CUSPARSE_API_supported_by_HIP.md
@@ -870,9 +870,9 @@
 |`cusparseSpGEMM_estimateMemory`|12.0| | | | | | | | |
 |`cusparseSpGEMM_getNumProducts`|12.0| | | | | | | | |
 |`cusparseSpGEMM_workEstimation`|11.0| | |`hipsparseSpGEMM_workEstimation`|4.1.0| | | | |
-|`cusparseSpGEMMreuse_compute`|11.3| | | | | | | | |
-|`cusparseSpGEMMreuse_copy`|11.3| | | | | | | | |
-|`cusparseSpGEMMreuse_nnz`|11.3| | | | | | | | |
+|`cusparseSpGEMMreuse_compute`|11.3| | |`hipsparseSpGEMMreuse_compute`|5.1.0| | | | |
+|`cusparseSpGEMMreuse_copy`|11.3| | |`hipsparseSpGEMMreuse_copy`|5.1.0| | | | |
+|`cusparseSpGEMMreuse_nnz`|11.3| | |`hipsparseSpGEMMreuse_nnz`|5.1.0| | | | |
 |`cusparseSpGEMMreuse_workEstimation`|11.3| | |`hipsparseSpGEMMreuse_workEstimation`|5.1.0| | | | |
 |`cusparseSpMM`|10.1| | |`hipsparseSpMM`|4.2.0| | | | |
 |`cusparseSpMMOp`|11.5| | | | | | | | |

diff --git a/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md b/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md
@@ -870,9 +870,9 @@
 |`cusparseSpGEMM_estimateMemory`|12.0| | | | | | | | | | | | | | |
 |`cusparseSpGEMM_getNumProducts`|12.0| | | | | | | | | | | | | | |
 |`cusparseSpGEMM_workEstimation`|11.0| | |`hipsparseSpGEMM_workEstimation`|4.1.0| | | | | | | | | | |
-|`cusparseSpGEMMreuse_compute`|11.3| | | | | | | | | | | | | | |
-|`cusparseSpGEMMreuse_copy`|11.3| | | | | | | | | | | | | | |
-|`cusparseSpGEMMreuse_nnz`|11.3| | | | | | | | | | | | | | |
+|`cusparseSpGEMMreuse_compute`|11.3| | |`hipsparseSpGEMMreuse_compute`|5.1.0| | | | | | | | | | |
+|`cusparseSpGEMMreuse_copy`|11.3| | |`hipsparseSpGEMMreuse_copy`|5.1.0| | | | | | | | | | |
+|`cusparseSpGEMMreuse_nnz`|11.3| | |`hipsparseSpGEMMreuse_nnz`|5.1.0| | | | | | | | | | |
 |`cusparseSpGEMMreuse_workEstimation`|11.3| | |`hipsparseSpGEMMreuse_workEstimation`|5.1.0| | | | | | | | | | |
 |`cusparseSpMM`|10.1| | |`hipsparseSpMM`|4.2.0| | | | | | | | | | |
 |`cusparseSpMMOp`|11.5| | | | | | | | | | | | | | |

diff --git a/src/CUDA2HIP_SPARSE_API_functions.cpp b/src/CUDA2HIP_SPARSE_API_functions.cpp
@@ -837,9 +837,9 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
 
   // Sparse Matrix Multiplication (SpGEMM) Structure Reuse
   {"cusparseSpGEMMreuse_workEstimation",                {"hipsparseSpGEMMreuse_workEstimation",                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, ROC_UNSUPPORTED}},
-  {"cusparseSpGEMMreuse_nnz",                           {"hipsparseSpGEMMreuse_nnz",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, UNSUPPORTED}},
-  {"cusparseSpGEMMreuse_copy",                          {"hipsparseSpGEMMreuse_copy",                          "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, UNSUPPORTED}},
-  {"cusparseSpGEMMreuse_compute",                       {"hipsparseSpGEMMreuse_compute",                       "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, UNSUPPORTED}},
+  {"cusparseSpGEMMreuse_nnz",                           {"hipsparseSpGEMMreuse_nnz",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, ROC_UNSUPPORTED}},
+  {"cusparseSpGEMMreuse_copy",                          {"hipsparseSpGEMMreuse_copy",                          "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, ROC_UNSUPPORTED}},
+  {"cusparseSpGEMMreuse_compute",                       {"hipsparseSpGEMMreuse_compute",                       "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, ROC_UNSUPPORTED}},
 
   // Sparse Matrix * Matrix Pattern-constrained Multiplication
   {"cusparseConstrainedGeMM",                           {"hipsparseConstrainedGeMM",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 15, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
@@ -1956,6 +1956,9 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_SPARSE_FUNCTION_VER_MAP {
   {"hipsparseCgpsvInterleavedBatch",                     {HIP_5010, HIP_0,    HIP_0   }},
   {"hipsparseZgpsvInterleavedBatch",                     {HIP_5010, HIP_0,    HIP_0   }},
   {"hipsparseSpGEMMreuse_workEstimation",                {HIP_5010, HIP_0,    HIP_0   }},
+  {"hipsparseSpGEMMreuse_nnz",                           {HIP_5010, HIP_0,    HIP_0   }},
+  {"hipsparseSpGEMMreuse_compute",                       {HIP_5010, HIP_0,    HIP_0   }},
+  {"hipsparseSpGEMMreuse_copy",                          {HIP_5010, HIP_0,    HIP_0   }},
   {"hipsparseSpMatGetStridedBatch",                      {HIP_5020, HIP_0,    HIP_0   }},
   {"hipsparseSpMatSetStridedBatch",                      {HIP_5020, HIP_0,    HIP_0   }},
   {"hipsparseCooSetStridedBatch",                        {HIP_5020, HIP_0,    HIP_0   }},