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

…functions + Updated synthetic tests and the regenerated hipify-perl and SPARSE docs
emankov · Aug 4, 2023 · 9dd3174 · 9dd3174
1 parent 8f64be6
commit 9dd3174
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 21 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
@@ -1460,6 +1460,7 @@ sub rocSubstitutions {
     subst("cusparseBlockedEllGet", "rocsparse_bell_get", "library");
     subst("cusparseCbsr2csr", "rocsparse_cbsr2csr", "library");
     subst("cusparseCcsr2csr_compress", "rocsparse_ccsr2csr_compress", "library");
+    subst("cusparseCcsr2gebsr", "rocsparse_ccsr2gebsr", "library");
     subst("cusparseCcsrcolor", "rocsparse_ccsrcolor", "library");
     subst("cusparseCgebsr2csr", "rocsparse_cgebsr2csr", "library");
     subst("cusparseCgebsr2gebsr", "rocsparse_cgebsr2gebsr", "library");
@@ -1487,6 +1488,8 @@ sub rocSubstitutions {
     subst("cusparseCsrSetPointers", "rocsparse_csr_set_pointers", "library");
     subst("cusparseCsrSetStridedBatch", "rocsparse_csr_set_strided_batch", "library");
     subst("cusparseDbsr2csr", "rocsparse_dbsr2csr", "library");
+    subst("cusparseDcsr2csr_compress", "rocsparse_dcsr2csr_compress", "library");
+    subst("cusparseDcsr2gebsr", "rocsparse_dcsr2gebsr", "library");
     subst("cusparseDcsrcolor", "rocsparse_dcsrcolor", "library");
     subst("cusparseDestroy", "rocsparse_destroy_handle", "library");
     subst("cusparseDestroyColorInfo", "rocsparse_destroy_color_info", "library");
@@ -1527,6 +1530,8 @@ sub rocSubstitutions {
     subst("cusparseSDDMM_preprocess", "rocsparse_sddmm_preprocess", "library");
     subst("cusparseSbsr2csr", "rocsparse_sbsr2csr", "library");
     subst("cusparseScatter", "rocsparse_scatter", "library");
+    subst("cusparseScsr2csr_compress", "rocsparse_scsr2csr_compress", "library");
+    subst("cusparseScsr2gebsr", "rocsparse_scsr2gebsr", "library");
     subst("cusparseScsrcolor", "rocsparse_scsrcolor", "library");
     subst("cusparseSetMatDiagType", "rocsparse_set_mat_diag_type", "library");
     subst("cusparseSetMatFillMode", "rocsparse_set_mat_fill_mode", "library");
@@ -1563,11 +1568,13 @@ sub rocSubstitutions {
     subst("cusparseXcoosort_bufferSizeExt", "rocsparse_coosort_buffer_size", "library");
     subst("cusparseXcscsort", "rocsparse_cscsort", "library");
     subst("cusparseXcscsort_bufferSizeExt", "rocsparse_cscsort_buffer_size", "library");
+    subst("cusparseXcsr2gebsrNnz", "rocsparse_csr2gebsr_nnz", "library");
     subst("cusparseXcsrsort", "rocsparse_csrsort", "library");
     subst("cusparseXcsrsort_bufferSizeExt", "rocsparse_csrsort_buffer_size", "library");
     subst("cusparseXgebsr2gebsrNnz", "rocsparse_gebsr2gebsr_nnz", "library");
     subst("cusparseZbsr2csr", "rocsparse_zbsr2csr", "library");
     subst("cusparseZcsr2csr_compress", "rocsparse_zcsr2csr_compress", "library");
+    subst("cusparseZcsr2gebsr", "rocsparse_zcsr2gebsr", "library");
     subst("cusparseZcsrcolor", "rocsparse_zcsrcolor", "library");
     subst("cusparseZgebsr2csr", "rocsparse_zgebsr2csr", "library");
     subst("cusparseZgebsr2gebsr", "rocsparse_zgebsr2gebsr", "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
@@ -623,7 +623,7 @@
 |`cusparseCcsr2csr_compress`|8.0| | |`hipsparseCcsr2csr_compress`|3.5.0| | | |`rocsparse_ccsr2csr_compress`|3.5.0| | | |
 |`cusparseCcsr2csru`| | | |`hipsparseCcsr2csru`|4.2.0| | | | | | | | |
 |`cusparseCcsr2dense`| |11.1|12.0|`hipsparseCcsr2dense`|3.5.0| | | | | | | | |
-|`cusparseCcsr2gebsr`| | | |`hipsparseCcsr2gebsr`|4.1.0| | | | | | | | |
+|`cusparseCcsr2gebsr`| | | |`hipsparseCcsr2gebsr`|4.1.0| | | |`rocsparse_ccsr2gebsr`|4.1.0| | | |
 |`cusparseCcsr2gebsr_bufferSize`| | | |`hipsparseCcsr2gebsr_bufferSize`|4.1.0| | | | | | | | |
 |`cusparseCcsr2gebsr_bufferSizeExt`| | | | | | | | | | | | | |
 |`cusparseCcsr2hyb`| |10.2|11.0|`hipsparseCcsr2hyb`|3.1.0| | | | | | | | |
@@ -654,10 +654,10 @@
 |`cusparseDcsc2hyb`| |10.2|11.0| | | | | | | | | | |
 |`cusparseDcsr2bsr`| | | |`hipsparseDcsr2bsr`|3.5.0| | | | | | | | |
 |`cusparseDcsr2csc`| |10.2|11.0|`hipsparseDcsr2csc`|1.9.2| | | | | | | | |
-|`cusparseDcsr2csr_compress`|8.0| | |`hipsparseDcsr2csr_compress`|3.5.0| | | | | | | | |
+|`cusparseDcsr2csr_compress`|8.0| | |`hipsparseDcsr2csr_compress`|3.5.0| | | |`rocsparse_dcsr2csr_compress`|3.5.0| | | |
 |`cusparseDcsr2csru`| | | |`hipsparseDcsr2csru`|4.2.0| | | | | | | | |
 |`cusparseDcsr2dense`| |11.1|12.0|`hipsparseDcsr2dense`|3.5.0| | | | | | | | |
-|`cusparseDcsr2gebsr`| | | |`hipsparseDcsr2gebsr`|4.1.0| | | | | | | | |
+|`cusparseDcsr2gebsr`| | | |`hipsparseDcsr2gebsr`|4.1.0| | | |`rocsparse_dcsr2gebsr`|4.1.0| | | |
 |`cusparseDcsr2gebsr_bufferSize`| | | |`hipsparseDcsr2gebsr_bufferSize`|4.1.0| | | | | | | | |
 |`cusparseDcsr2gebsr_bufferSizeExt`| | | | | | | | | | | | | |
 |`cusparseDcsr2hyb`| |10.2|11.0|`hipsparseDcsr2hyb`|1.9.2| | | | | | | | |
@@ -708,10 +708,10 @@
 |`cusparseScsc2hyb`| |10.2|11.0| | | | | | | | | | |
 |`cusparseScsr2bsr`| | | |`hipsparseScsr2bsr`|3.5.0| | | | | | | | |
 |`cusparseScsr2csc`| |10.2|11.0|`hipsparseScsr2csc`|1.9.2| | | | | | | | |
-|`cusparseScsr2csr_compress`|8.0| | |`hipsparseScsr2csr_compress`|3.5.0| | | | | | | | |
+|`cusparseScsr2csr_compress`|8.0| | |`hipsparseScsr2csr_compress`|3.5.0| | | |`rocsparse_scsr2csr_compress`|3.5.0| | | |
 |`cusparseScsr2csru`| | | |`hipsparseScsr2csru`|4.2.0| | | | | | | | |
 |`cusparseScsr2dense`| |11.1|12.0|`hipsparseScsr2dense`|3.5.0| | | | | | | | |
-|`cusparseScsr2gebsr`| | | |`hipsparseScsr2gebsr`|4.1.0| | | | | | | | |
+|`cusparseScsr2gebsr`| | | |`hipsparseScsr2gebsr`|4.1.0| | | |`rocsparse_scsr2gebsr`|4.1.0| | | |
 |`cusparseScsr2gebsr_bufferSize`| | | |`hipsparseScsr2gebsr_bufferSize`|4.1.0| | | | | | | | |
 |`cusparseScsr2gebsr_bufferSizeExt`| | | | | | | | | | | | | |
 |`cusparseScsr2hyb`| |10.2|11.0|`hipsparseScsr2hyb`|1.9.2| | | | | | | | |
@@ -752,7 +752,7 @@
 |`cusparseXcscsort_bufferSizeExt`| | | |`hipsparseXcscsort_bufferSizeExt`|2.10.0| | | |`rocsparse_cscsort_buffer_size`|2.10.0| | | |
 |`cusparseXcsr2bsrNnz`| | | |`hipsparseXcsr2bsrNnz`|3.5.0| | | | | | | | |
 |`cusparseXcsr2coo`| | | |`hipsparseXcsr2coo`|1.9.2| | | | | | | | |
-|`cusparseXcsr2gebsrNnz`| | | |`hipsparseXcsr2gebsrNnz`|4.1.0| | | | | | | | |
+|`cusparseXcsr2gebsrNnz`| | | |`hipsparseXcsr2gebsrNnz`|4.1.0| | | |`rocsparse_csr2gebsr_nnz`|4.1.0| | | |
 |`cusparseXcsrsort`| | | |`hipsparseXcsrsort`|1.9.2| | | |`rocsparse_csrsort`|1.9.0| | | |
 |`cusparseXcsrsort_bufferSizeExt`| | | |`hipsparseXcsrsort_bufferSizeExt`|1.9.2| | | |`rocsparse_csrsort_buffer_size`|1.9.0| | | |
 |`cusparseXgebsr2csr`| | | | | | | | | | | | | |
@@ -765,7 +765,7 @@
 |`cusparseZcsr2csr_compress`|8.0| | |`hipsparseZcsr2csr_compress`|3.5.0| | | |`rocsparse_zcsr2csr_compress`|3.5.0| | | |
 |`cusparseZcsr2csru`| | | |`hipsparseZcsr2csru`|4.2.0| | | | | | | | |
 |`cusparseZcsr2dense`| |11.1|12.0|`hipsparseZcsr2dense`|3.5.0| | | | | | | | |
-|`cusparseZcsr2gebsr`| | | |`hipsparseZcsr2gebsr`|4.1.0| | | | | | | | |
+|`cusparseZcsr2gebsr`| | | |`hipsparseZcsr2gebsr`|4.1.0| | | |`rocsparse_zcsr2gebsr`|4.1.0| | | |
 |`cusparseZcsr2gebsr_bufferSize`| | | |`hipsparseZcsr2gebsr_bufferSize`|4.1.0| | | | | | | | |
 |`cusparseZcsr2gebsr_bufferSizeExt`| | | | | | | | | | | | | |
 |`cusparseZcsr2hyb`| |10.2|11.0|`hipsparseZcsr2hyb`|3.1.0| | | | | | | | |

diff --git a/docs/tables/CUSPARSE_API_supported_by_ROC.md b/docs/tables/CUSPARSE_API_supported_by_ROC.md
@@ -623,7 +623,7 @@
 |`cusparseCcsr2csr_compress`|8.0| | |`rocsparse_ccsr2csr_compress`|3.5.0| | | |
 |`cusparseCcsr2csru`| | | | | | | | |
 |`cusparseCcsr2dense`| |11.1|12.0| | | | | |
-|`cusparseCcsr2gebsr`| | | | | | | | |
+|`cusparseCcsr2gebsr`| | | |`rocsparse_ccsr2gebsr`|4.1.0| | | |
 |`cusparseCcsr2gebsr_bufferSize`| | | | | | | | |
 |`cusparseCcsr2gebsr_bufferSizeExt`| | | | | | | | |
 |`cusparseCcsr2hyb`| |10.2|11.0| | | | | |
@@ -654,10 +654,10 @@
 |`cusparseDcsc2hyb`| |10.2|11.0| | | | | |
 |`cusparseDcsr2bsr`| | | | | | | | |
 |`cusparseDcsr2csc`| |10.2|11.0| | | | | |
-|`cusparseDcsr2csr_compress`|8.0| | | | | | | |
+|`cusparseDcsr2csr_compress`|8.0| | |`rocsparse_dcsr2csr_compress`|3.5.0| | | |
 |`cusparseDcsr2csru`| | | | | | | | |
 |`cusparseDcsr2dense`| |11.1|12.0| | | | | |
-|`cusparseDcsr2gebsr`| | | | | | | | |
+|`cusparseDcsr2gebsr`| | | |`rocsparse_dcsr2gebsr`|4.1.0| | | |
 |`cusparseDcsr2gebsr_bufferSize`| | | | | | | | |
 |`cusparseDcsr2gebsr_bufferSizeExt`| | | | | | | | |
 |`cusparseDcsr2hyb`| |10.2|11.0| | | | | |
@@ -708,10 +708,10 @@
 |`cusparseScsc2hyb`| |10.2|11.0| | | | | |
 |`cusparseScsr2bsr`| | | | | | | | |
 |`cusparseScsr2csc`| |10.2|11.0| | | | | |
-|`cusparseScsr2csr_compress`|8.0| | | | | | | |
+|`cusparseScsr2csr_compress`|8.0| | |`rocsparse_scsr2csr_compress`|3.5.0| | | |
 |`cusparseScsr2csru`| | | | | | | | |
 |`cusparseScsr2dense`| |11.1|12.0| | | | | |
-|`cusparseScsr2gebsr`| | | | | | | | |
+|`cusparseScsr2gebsr`| | | |`rocsparse_scsr2gebsr`|4.1.0| | | |
 |`cusparseScsr2gebsr_bufferSize`| | | | | | | | |
 |`cusparseScsr2gebsr_bufferSizeExt`| | | | | | | | |
 |`cusparseScsr2hyb`| |10.2|11.0| | | | | |
@@ -752,7 +752,7 @@
 |`cusparseXcscsort_bufferSizeExt`| | | |`rocsparse_cscsort_buffer_size`|2.10.0| | | |
 |`cusparseXcsr2bsrNnz`| | | | | | | | |
 |`cusparseXcsr2coo`| | | | | | | | |
-|`cusparseXcsr2gebsrNnz`| | | | | | | | |
+|`cusparseXcsr2gebsrNnz`| | | |`rocsparse_csr2gebsr_nnz`|4.1.0| | | |
 |`cusparseXcsrsort`| | | |`rocsparse_csrsort`|1.9.0| | | |
 |`cusparseXcsrsort_bufferSizeExt`| | | |`rocsparse_csrsort_buffer_size`|1.9.0| | | |
 |`cusparseXgebsr2csr`| | | | | | | | |
@@ -765,7 +765,7 @@
 |`cusparseZcsr2csr_compress`|8.0| | |`rocsparse_zcsr2csr_compress`|3.5.0| | | |
 |`cusparseZcsr2csru`| | | | | | | | |
 |`cusparseZcsr2dense`| |11.1|12.0| | | | | |
-|`cusparseZcsr2gebsr`| | | | | | | | |
+|`cusparseZcsr2gebsr`| | | |`rocsparse_zcsr2gebsr`|4.1.0| | | |
 |`cusparseZcsr2gebsr_bufferSize`| | | | | | | | |
 |`cusparseZcsr2gebsr_bufferSizeExt`| | | | | | | | |
 |`cusparseZcsr2hyb`| |10.2|11.0| | | | | |

diff --git a/src/CUDA2HIP_SPARSE_API_functions.cpp b/src/CUDA2HIP_SPARSE_API_functions.cpp
@@ -545,11 +545,11 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseZcsr2gebsr_bufferSize",                     {"hipsparseZcsr2gebsr_bufferSize",                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
   {"cusparseZcsr2gebsr_bufferSizeExt",                  {"hipsparseZcsr2gebsr_bufferSizeExt",                  "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, UNSUPPORTED}},
 
-  {"cusparseXcsr2gebsrNnz",                             {"hipsparseXcsr2gebsrNnz",                             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
-  {"cusparseScsr2gebsr",                                {"hipsparseScsr2gebsr",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
-  {"cusparseDcsr2gebsr",                                {"hipsparseDcsr2gebsr",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
-  {"cusparseCcsr2gebsr",                                {"hipsparseCcsr2gebsr",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
-  {"cusparseZcsr2gebsr",                                {"hipsparseZcsr2gebsr",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
+  {"cusparseXcsr2gebsrNnz",                             {"hipsparseXcsr2gebsrNnz",                             "rocsparse_csr2gebsr_nnz",                                          CONV_LIB_FUNC, API_SPARSE, 14}},
+  {"cusparseScsr2gebsr",                                {"hipsparseScsr2gebsr",                                "rocsparse_scsr2gebsr",                                             CONV_LIB_FUNC, API_SPARSE, 14}},
+  {"cusparseDcsr2gebsr",                                {"hipsparseDcsr2gebsr",                                "rocsparse_dcsr2gebsr",                                             CONV_LIB_FUNC, API_SPARSE, 14}},
+  {"cusparseCcsr2gebsr",                                {"hipsparseCcsr2gebsr",                                "rocsparse_ccsr2gebsr",                                             CONV_LIB_FUNC, API_SPARSE, 14}},
+  {"cusparseZcsr2gebsr",                                {"hipsparseZcsr2gebsr",                                "rocsparse_zcsr2gebsr",                                             CONV_LIB_FUNC, API_SPARSE, 14}},
 
   {"cusparseXcoo2csr",                                  {"hipsparseXcoo2csr",                                  "rocsparse_coo2csr",                                                CONV_LIB_FUNC, API_SPARSE, 14}},
 
@@ -585,8 +585,8 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseCcsr2dense",                                {"hipsparseCcsr2dense",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseZcsr2dense",                                {"hipsparseZcsr2dense",                                "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
 
-  {"cusparseScsr2csr_compress",                         {"hipsparseScsr2csr_compress",                         "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
-  {"cusparseDcsr2csr_compress",                         {"hipsparseDcsr2csr_compress",                         "",                                                                 CONV_LIB_FUNC, API_SPARSE, 14, ROC_UNSUPPORTED}},
+  {"cusparseScsr2csr_compress",                         {"hipsparseScsr2csr_compress",                         "rocsparse_scsr2csr_compress",                                      CONV_LIB_FUNC, API_SPARSE, 14}},
+  {"cusparseDcsr2csr_compress",                         {"hipsparseDcsr2csr_compress",                         "rocsparse_dcsr2csr_compress",                                      CONV_LIB_FUNC, API_SPARSE, 14}},
   {"cusparseCcsr2csr_compress",                         {"hipsparseCcsr2csr_compress",                         "rocsparse_ccsr2csr_compress",                                      CONV_LIB_FUNC, API_SPARSE, 14}},
   {"cusparseZcsr2csr_compress",                         {"hipsparseZcsr2csr_compress",                         "rocsparse_zcsr2csr_compress",                                      CONV_LIB_FUNC, API_SPARSE, 14}},
 
@@ -1920,6 +1920,13 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_SPARSE_FUNCTION_VER_MAP {
   {"rocsparse_sprune_csr2csr_buffer_size",               {HIP_3090, HIP_0,    HIP_0   }},
   {"rocsparse_zcsr2csr_compress",                        {HIP_3050, HIP_0,    HIP_0   }},
   {"rocsparse_ccsr2csr_compress",                        {HIP_3050, HIP_0,    HIP_0   }},
+  {"rocsparse_dcsr2csr_compress",                        {HIP_3050, HIP_0,    HIP_0   }},
+  {"rocsparse_scsr2csr_compress",                        {HIP_3050, HIP_0,    HIP_0   }},
+  {"rocsparse_zcsr2gebsr",                               {HIP_4010, HIP_0,    HIP_0   }},
+  {"rocsparse_ccsr2gebsr",                               {HIP_4010, HIP_0,    HIP_0   }},
+  {"rocsparse_dcsr2gebsr",                               {HIP_4010, HIP_0,    HIP_0   }},
+  {"rocsparse_scsr2gebsr",                               {HIP_4010, HIP_0,    HIP_0   }},
+  {"rocsparse_csr2gebsr_nnz",                            {HIP_4010, HIP_0,    HIP_0   }},
 };
 
 const std::map<unsigned int, llvm::StringRef> CUDA_SPARSE_API_SECTION_MAP {