[HIPIFY][ROCm#674][rocSPARSE][feature] rocSPARSE support - Step 29 - …

…functions + Updated synthetic tests and the regenerated hipify-perl and SPARSE docs
emankov · Aug 23, 2023 · 79d3422 · 79d3422
1 parent c0bbe5e
commit 79d3422
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 24 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
@@ -1749,6 +1749,10 @@ sub rocSubstitutions {
     subst("cusparseDpruneCsr2csrNnz", "rocsparse_dprune_csr2csr_nnz", "library");
     subst("cusparseDpruneCsr2csrNnzByPercentage", "rocsparse_dprune_csr2csr_nnz_by_percentage", "library");
     subst("cusparseDpruneCsr2csr_bufferSizeExt", "rocsparse_dprune_csr2csr_buffer_size", "library");
+    subst("cusparseDpruneDense2csr", "rocsparse_dprune_dense2csr", "library");
+    subst("cusparseDpruneDense2csrByPercentage", "rocsparse_dprune_dense2csr_by_percentage", "library");
+    subst("cusparseDpruneDense2csrByPercentage_bufferSizeExt", "rocsparse_dprune_dense2csr_by_percentage_buffer_size", "library");
+    subst("cusparseDpruneDense2csrNnzByPercentage", "rocsparse_dprune_dense2csr_nnz_by_percentage", "library");
     subst("cusparseGather", "rocsparse_gather", "library");
     subst("cusparseGetMatDiagType", "rocsparse_get_mat_diag_type", "library");
     subst("cusparseGetMatFillMode", "rocsparse_get_mat_fill_mode", "library");
@@ -1804,6 +1808,10 @@ sub rocSubstitutions {
     subst("cusparseSpruneCsr2csrNnz", "rocsparse_sprune_csr2csr_nnz", "library");
     subst("cusparseSpruneCsr2csrNnzByPercentage", "rocsparse_sprune_csr2csr_nnz_by_percentage", "library");
     subst("cusparseSpruneCsr2csr_bufferSizeExt", "rocsparse_sprune_csr2csr_buffer_size", "library");
+    subst("cusparseSpruneDense2csr", "rocsparse_sprune_dense2csr", "library");
+    subst("cusparseSpruneDense2csrByPercentage", "rocsparse_sprune_dense2csr_by_percentage", "library");
+    subst("cusparseSpruneDense2csrByPercentage_bufferSizeExt", "rocsparse_sprune_dense2csr_by_percentage_buffer_size", "library");
+    subst("cusparseSpruneDense2csrNnzByPercentage", "rocsparse_sprune_dense2csr_nnz_by_percentage", "library");
     subst("cusparseXcoo2csr", "rocsparse_coo2csr", "library");
     subst("cusparseXcoosortByColumn", "rocsparse_coosort_by_column", "library");
     subst("cusparseXcoosortByRow", "rocsparse_coosort_by_row", "library");

diff --git a/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md b/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md
@@ -690,11 +690,11 @@
 |`cusparseDpruneCsr2csrNnz`|9.0|12.2| |`hipsparseDpruneCsr2csrNnz`|3.9.0| | | |`rocsparse_dprune_csr2csr_nnz`|3.9.0| | | |
 |`cusparseDpruneCsr2csrNnzByPercentage`|9.0|12.2| |`hipsparseDpruneCsr2csrNnzByPercentage`|3.9.0| | | |`rocsparse_dprune_csr2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseDpruneCsr2csr_bufferSizeExt`|9.0|12.2| |`hipsparseDpruneCsr2csr_bufferSizeExt`|3.9.0| | | |`rocsparse_dprune_csr2csr_buffer_size`|3.9.0| | | |
-|`cusparseDpruneDense2csr`|9.0|12.2| |`hipsparseDpruneDense2csr`|3.9.0| | | | | | | | |
-|`cusparseDpruneDense2csrByPercentage`|9.0|12.2| |`hipsparseDpruneDense2csrByPercentage`|3.9.0| | | | | | | | |
-|`cusparseDpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`hipsparseDpruneDense2csrByPercentage_bufferSizeExt`|3.9.0| | | | | | | | |
+|`cusparseDpruneDense2csr`|9.0|12.2| |`hipsparseDpruneDense2csr`|3.9.0| | | |`rocsparse_dprune_dense2csr`|3.9.0| | | |
+|`cusparseDpruneDense2csrByPercentage`|9.0|12.2| |`hipsparseDpruneDense2csrByPercentage`|3.9.0| | | |`rocsparse_dprune_dense2csr_by_percentage`|3.9.0| | | |
+|`cusparseDpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`hipsparseDpruneDense2csrByPercentage_bufferSizeExt`|3.9.0| | | |`rocsparse_dprune_dense2csr_by_percentage_buffer_size`|3.9.0| | | |
 |`cusparseDpruneDense2csrNnz`|9.0|12.2| |`hipsparseDpruneDense2csrNnz`|3.9.0| | | | | | | | |
-|`cusparseDpruneDense2csrNnzByPercentage`|9.0|12.2| |`hipsparseDpruneDense2csrNnzByPercentage`|3.9.0| | | | | | | | |
+|`cusparseDpruneDense2csrNnzByPercentage`|9.0|12.2| |`hipsparseDpruneDense2csrNnzByPercentage`|3.9.0| | | |`rocsparse_dprune_dense2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseDpruneDense2csr_bufferSizeExt`|9.0|12.2| |`hipsparseDpruneDense2csr_bufferSizeExt`|3.9.0| | | | | | | | |
 |`cusparseHpruneCsr2csr`|9.0|12.2| | | | | | | | | | | |
 |`cusparseHpruneCsr2csrByPercentage`|9.0|12.2| | | | | | | | | | | |
@@ -743,11 +743,11 @@
 |`cusparseSpruneCsr2csrNnz`|9.0|12.2| |`hipsparseSpruneCsr2csrNnz`|3.9.0| | | |`rocsparse_sprune_csr2csr_nnz`|3.9.0| | | |
 |`cusparseSpruneCsr2csrNnzByPercentage`|9.0|12.2| |`hipsparseSpruneCsr2csrNnzByPercentage`|3.9.0| | | |`rocsparse_sprune_csr2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseSpruneCsr2csr_bufferSizeExt`|9.0|12.2| |`hipsparseSpruneCsr2csr_bufferSizeExt`|3.9.0| | | |`rocsparse_sprune_csr2csr_buffer_size`|3.9.0| | | |
-|`cusparseSpruneDense2csr`|9.0|12.2| |`hipsparseSpruneDense2csr`|3.9.0| | | | | | | | |
-|`cusparseSpruneDense2csrByPercentage`|9.0|12.2| |`hipsparseSpruneDense2csrByPercentage`|3.9.0| | | | | | | | |
-|`cusparseSpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`hipsparseSpruneDense2csrByPercentage_bufferSizeExt`|3.9.0| | | | | | | | |
+|`cusparseSpruneDense2csr`|9.0|12.2| |`hipsparseSpruneDense2csr`|3.9.0| | | |`rocsparse_sprune_dense2csr`|3.9.0| | | |
+|`cusparseSpruneDense2csrByPercentage`|9.0|12.2| |`hipsparseSpruneDense2csrByPercentage`|3.9.0| | | |`rocsparse_sprune_dense2csr_by_percentage`|3.9.0| | | |
+|`cusparseSpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`hipsparseSpruneDense2csrByPercentage_bufferSizeExt`|3.9.0| | | |`rocsparse_sprune_dense2csr_by_percentage_buffer_size`|3.9.0| | | |
 |`cusparseSpruneDense2csrNnz`|9.0|12.2| |`hipsparseSpruneDense2csrNnz`|3.9.0| | | | | | | | |
-|`cusparseSpruneDense2csrNnzByPercentage`|9.0|12.2| |`hipsparseSpruneDense2csrNnzByPercentage`|3.9.0| | | | | | | | |
+|`cusparseSpruneDense2csrNnzByPercentage`|9.0|12.2| |`hipsparseSpruneDense2csrNnzByPercentage`|3.9.0| | | |`rocsparse_sprune_dense2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseSpruneDense2csr_bufferSizeExt`|9.0|12.2| |`hipsparseSpruneDense2csr_bufferSizeExt`|3.9.0| | | | | | | | |
 |`cusparseXcoo2csr`| | | |`hipsparseXcoo2csr`|1.9.2| | | |`rocsparse_coo2csr`|1.9.0| | | |
 |`cusparseXcoosortByColumn`| | | |`hipsparseXcoosortByColumn`|1.9.2| | | |`rocsparse_coosort_by_column`|1.9.0| | | |

diff --git a/docs/tables/CUSPARSE_API_supported_by_ROC.md b/docs/tables/CUSPARSE_API_supported_by_ROC.md
@@ -690,11 +690,11 @@
 |`cusparseDpruneCsr2csrNnz`|9.0|12.2| |`rocsparse_dprune_csr2csr_nnz`|3.9.0| | | |
 |`cusparseDpruneCsr2csrNnzByPercentage`|9.0|12.2| |`rocsparse_dprune_csr2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseDpruneCsr2csr_bufferSizeExt`|9.0|12.2| |`rocsparse_dprune_csr2csr_buffer_size`|3.9.0| | | |
-|`cusparseDpruneDense2csr`|9.0|12.2| | | | | | |
-|`cusparseDpruneDense2csrByPercentage`|9.0|12.2| | | | | | |
-|`cusparseDpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| | | | | | |
+|`cusparseDpruneDense2csr`|9.0|12.2| |`rocsparse_dprune_dense2csr`|3.9.0| | | |
+|`cusparseDpruneDense2csrByPercentage`|9.0|12.2| |`rocsparse_dprune_dense2csr_by_percentage`|3.9.0| | | |
+|`cusparseDpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`rocsparse_dprune_dense2csr_by_percentage_buffer_size`|3.9.0| | | |
 |`cusparseDpruneDense2csrNnz`|9.0|12.2| | | | | | |
-|`cusparseDpruneDense2csrNnzByPercentage`|9.0|12.2| | | | | | |
+|`cusparseDpruneDense2csrNnzByPercentage`|9.0|12.2| |`rocsparse_dprune_dense2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseDpruneDense2csr_bufferSizeExt`|9.0|12.2| | | | | | |
 |`cusparseHpruneCsr2csr`|9.0|12.2| | | | | | |
 |`cusparseHpruneCsr2csrByPercentage`|9.0|12.2| | | | | | |
@@ -743,11 +743,11 @@
 |`cusparseSpruneCsr2csrNnz`|9.0|12.2| |`rocsparse_sprune_csr2csr_nnz`|3.9.0| | | |
 |`cusparseSpruneCsr2csrNnzByPercentage`|9.0|12.2| |`rocsparse_sprune_csr2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseSpruneCsr2csr_bufferSizeExt`|9.0|12.2| |`rocsparse_sprune_csr2csr_buffer_size`|3.9.0| | | |
-|`cusparseSpruneDense2csr`|9.0|12.2| | | | | | |
-|`cusparseSpruneDense2csrByPercentage`|9.0|12.2| | | | | | |
-|`cusparseSpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| | | | | | |
+|`cusparseSpruneDense2csr`|9.0|12.2| |`rocsparse_sprune_dense2csr`|3.9.0| | | |
+|`cusparseSpruneDense2csrByPercentage`|9.0|12.2| |`rocsparse_sprune_dense2csr_by_percentage`|3.9.0| | | |
+|`cusparseSpruneDense2csrByPercentage_bufferSizeExt`|9.0|12.2| |`rocsparse_sprune_dense2csr_by_percentage_buffer_size`|3.9.0| | | |
 |`cusparseSpruneDense2csrNnz`|9.0|12.2| | | | | | |
-|`cusparseSpruneDense2csrNnzByPercentage`|9.0|12.2| | | | | | |
+|`cusparseSpruneDense2csrNnzByPercentage`|9.0|12.2| |`rocsparse_sprune_dense2csr_nnz_by_percentage`|3.9.0| | | |
 |`cusparseSpruneDense2csr_bufferSizeExt`|9.0|12.2| | | | | | |
 |`cusparseXcoo2csr`| | | |`rocsparse_coo2csr`|1.9.0| | | |
 |`cusparseXcoosortByColumn`| | | |`rocsparse_coosort_by_column`|1.9.0| | | |

diff --git a/src/CUDA2HIP_SPARSE_API_functions.cpp b/src/CUDA2HIP_SPARSE_API_functions.cpp
@@ -665,8 +665,8 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseZcsr2csru",                                 {"hipsparseZcsr2csru",                                 "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
 
   {"cusparseHpruneDense2csr",                           {"hipsparseHpruneDense2csr",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseSpruneDense2csr",                           {"hipsparseSpruneDense2csr",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseDpruneDense2csr",                           {"hipsparseDpruneDense2csr",                           "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
+  {"cusparseSpruneDense2csr",                           {"hipsparseSpruneDense2csr",                           "rocsparse_sprune_dense2csr",                                       CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
+  {"cusparseDpruneDense2csr",                           {"hipsparseDpruneDense2csr",                           "rocsparse_dprune_dense2csr",                                       CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
 
   {"cusparseHpruneDense2csr_bufferSizeExt",             {"hipsparseHpruneDense2csr_bufferSizeExt",             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
   {"cusparseSpruneDense2csr_bufferSizeExt",             {"hipsparseSpruneDense2csr_bufferSizeExt",             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
@@ -689,16 +689,16 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseDpruneCsr2csrNnz",                          {"hipsparseDpruneCsr2csrNnz",                          "rocsparse_dprune_csr2csr_nnz",                                     CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
 
   {"cusparseHpruneDense2csrByPercentage",               {"hipsparseHpruneDense2csrByPercentage",               "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseSpruneDense2csrByPercentage",               {"hipsparseSpruneDense2csrByPercentage",               "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseDpruneDense2csrByPercentage",               {"hipsparseDpruneDense2csrByPercentage",               "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
+  {"cusparseSpruneDense2csrByPercentage",               {"hipsparseSpruneDense2csrByPercentage",               "rocsparse_sprune_dense2csr_by_percentage",                         CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
+  {"cusparseDpruneDense2csrByPercentage",               {"hipsparseDpruneDense2csrByPercentage",               "rocsparse_dprune_dense2csr_by_percentage",                         CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
 
   {"cusparseHpruneDense2csrByPercentage_bufferSizeExt", {"hipsparseHpruneDense2csrByPercentage_bufferSizeExt", "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseSpruneDense2csrByPercentage_bufferSizeExt", {"hipsparseSpruneDense2csrByPercentage_bufferSizeExt", "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseDpruneDense2csrByPercentage_bufferSizeExt", {"hipsparseDpruneDense2csrByPercentage_bufferSizeExt", "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
+  {"cusparseSpruneDense2csrByPercentage_bufferSizeExt", {"hipsparseSpruneDense2csrByPercentage_bufferSizeExt", "rocsparse_sprune_dense2csr_by_percentage_buffer_size",             CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
+  {"cusparseDpruneDense2csrByPercentage_bufferSizeExt", {"hipsparseDpruneDense2csrByPercentage_bufferSizeExt", "rocsparse_dprune_dense2csr_by_percentage_buffer_size",             CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
 
   {"cusparseHpruneDense2csrNnzByPercentage",            {"hipsparseHpruneDense2csrNnzByPercentage",            "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseSpruneDense2csrNnzByPercentage",            {"hipsparseSpruneDense2csrNnzByPercentage",            "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
-  {"cusparseDpruneDense2csrNnzByPercentage",            {"hipsparseDpruneDense2csrNnzByPercentage",            "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
+  {"cusparseSpruneDense2csrNnzByPercentage",            {"hipsparseSpruneDense2csrNnzByPercentage",            "rocsparse_sprune_dense2csr_nnz_by_percentage",                     CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
+  {"cusparseDpruneDense2csrNnzByPercentage",            {"hipsparseDpruneDense2csrNnzByPercentage",            "rocsparse_dprune_dense2csr_nnz_by_percentage",                     CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
 
   {"cusparseHpruneCsr2csrByPercentage",                 {"hipsparseHpruneCsr2csrByPercentage",                 "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED | CUDA_DEPRECATED}},
   {"cusparseSpruneCsr2csrByPercentage",                 {"hipsparseSpruneCsr2csrByPercentage",                 "rocsparse_sprune_csr2csr_by_percentage",                           CONV_LIB_FUNC, API_SPARSE, 14, CUDA_DEPRECATED}},
@@ -2112,6 +2112,14 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_SPARSE_FUNCTION_VER_MAP {
   {"rocsparse_cdense2csc",                               {HIP_3020, HIP_0,    HIP_0   }},
   {"rocsparse_ddense2csc",                               {HIP_3020, HIP_0,    HIP_0   }},
   {"rocsparse_sdense2csc",                               {HIP_3020, HIP_0,    HIP_0   }},
+  {"rocsparse_dprune_dense2csr_by_percentage",           {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_sprune_dense2csr_by_percentage",           {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_dprune_dense2csr_nnz_by_percentage",       {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_sprune_dense2csr_nnz_by_percentage",       {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_dprune_dense2csr_by_percentage_buffer_size", {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_sprune_dense2csr_by_percentage_buffer_size", {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_dprune_dense2csr",                         {HIP_3090, HIP_0,    HIP_0   }},
+  {"rocsparse_sprune_dense2csr",                         {HIP_3090, HIP_0,    HIP_0   }},
 };
 
 const std::map<unsigned int, llvm::StringRef> CUDA_SPARSE_API_SECTION_MAP {