[HIPIFY][ROCm#674][ROCm#837][rocSPARSE][feature] rocSPARSE support - …

…Step 32 - functions + Implemented a new function call transformation type "additional non-const arg" (`e_add_var_argument`) + The variable for the adding function argument is a copy of another function call argument + The new transformation is tested on rocSPARSE functions `rocsparse_(s|d|c|z)gpsv_interleaved_batch`, where: - an additional argument rocsparse_int batch_stride is copied from the previous one: rocsparse_int batch_count; - it is how hipsparse(S|D|C|Z)gpsvInterleavedBatch calls rocsparse_(s|d|c|z)gpsv_interleaved_batch in its implementation; + Updated synthetic tests and the regenerated hipify-perl and SPARSE docs
emankov · Aug 28, 2023 · b4f18fd · b4f18fd
1 parent 17e440f
commit b4f18fd
Show file tree

Hide file tree

Showing 7 changed files with 139 additions and 27 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
@@ -1689,6 +1689,7 @@ sub rocSubstitutions {
     subst("cusparseCgebsr2gebsc_bufferSize", "rocsparse_cgebsr2gebsc_buffer_size", "library");
     subst("cusparseCgebsr2gebsr", "rocsparse_cgebsr2gebsr", "library");
     subst("cusparseCgebsr2gebsr_bufferSize", "rocsparse_cgebsr2gebsr_buffer_size", "library");
+    subst("cusparseCgpsvInterleavedBatch", "rocsparse_cgpsv_interleaved_batch", "library");
     subst("cusparseCnnz", "rocsparse_cnnz", "library");
     subst("cusparseCnnz_compress", "rocsparse_cnnz_compress", "library");
     subst("cusparseCooAoSGet", "rocsparse_coo_aos_get", "library");
@@ -1737,6 +1738,7 @@ sub rocSubstitutions {
     subst("cusparseDgebsr2gebsc_bufferSize", "rocsparse_dgebsr2gebsc_buffer_size", "library");
     subst("cusparseDgebsr2gebsr", "rocsparse_dgebsr2gebsr", "library");
     subst("cusparseDgebsr2gebsr_bufferSize", "rocsparse_dgebsr2gebsr_buffer_size", "library");
+    subst("cusparseDgpsvInterleavedBatch", "rocsparse_dgpsv_interleaved_batch", "library");
     subst("cusparseDnMatGet", "rocsparse_dnmat_get", "library");
     subst("cusparseDnMatGetStridedBatch", "rocsparse_dnmat_get_strided_batch", "library");
     subst("cusparseDnMatGetValues", "rocsparse_dnmat_get_values", "library");
@@ -1794,6 +1796,7 @@ sub rocSubstitutions {
     subst("cusparseSgebsr2gebsc_bufferSize", "rocsparse_sgebsr2gebsc_buffer_size", "library");
     subst("cusparseSgebsr2gebsr", "rocsparse_sgebsr2gebsr", "library");
     subst("cusparseSgebsr2gebsr_bufferSize", "rocsparse_sgebsr2gebsr_buffer_size", "library");
+    subst("cusparseSgpsvInterleavedBatch", "rocsparse_sgpsv_interleaved_batch", "library");
     subst("cusparseSnnz", "rocsparse_snnz", "library");
     subst("cusparseSnnz_compress", "rocsparse_snnz_compress", "library");
     subst("cusparseSpMV", "rocsparse_spmv", "library");
@@ -1850,6 +1853,7 @@ sub rocSubstitutions {
     subst("cusparseZgebsr2gebsc_bufferSize", "rocsparse_zgebsr2gebsc_buffer_size", "library");
     subst("cusparseZgebsr2gebsr", "rocsparse_zgebsr2gebsr", "library");
     subst("cusparseZgebsr2gebsr_bufferSize", "rocsparse_zgebsr2gebsr_buffer_size", "library");
+    subst("cusparseZgpsvInterleavedBatch", "rocsparse_zgpsv_interleaved_batch", "library");
     subst("cusparseZnnz", "rocsparse_znnz", "library");
     subst("cusparseZnnz_compress", "rocsparse_znnz_compress", "library");
     subst("cublas.h", "rocblas.h", "include_cuda_main_header");

diff --git a/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md b/docs/tables/CUSPARSE_API_supported_by_HIP_and_ROC.md
@@ -489,7 +489,7 @@
 |`cusparseCcsrilu02_bufferSize`| |12.2| |`hipsparseCcsrilu02_bufferSize`|3.1.0| | | | | | | | |
 |`cusparseCcsrilu02_bufferSizeExt`| |12.2| |`hipsparseCcsrilu02_bufferSizeExt`|3.1.0| | | | | | | | |
 |`cusparseCcsrilu02_numericBoost`| |12.2| |`hipsparseCcsrilu02_numericBoost`|3.10.0| | | | | | | | |
-|`cusparseCgpsvInterleavedBatch`|9.2| | |`hipsparseCgpsvInterleavedBatch`|5.1.0| | | | | | | | |
+|`cusparseCgpsvInterleavedBatch`|9.2| | |`hipsparseCgpsvInterleavedBatch`|5.1.0| | | |`rocsparse_cgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseCgpsvInterleavedBatch_bufferSizeExt`|9.2| | |`hipsparseCgpsvInterleavedBatch_bufferSizeExt`|5.1.0| | | | | | | | |
 |`cusparseCgtsv`| |10.2|11.0| | | | | | | | | | |
 |`cusparseCgtsv2`|9.0| | |`hipsparseCgtsv2`|4.3.0| | | | | | | | |
@@ -523,7 +523,7 @@
 |`cusparseDcsrilu02_bufferSize`| |12.2| |`hipsparseDcsrilu02_bufferSize`|1.9.2| | | | | | | | |
 |`cusparseDcsrilu02_bufferSizeExt`| |12.2| |`hipsparseDcsrilu02_bufferSizeExt`|1.9.2| | | | | | | | |
 |`cusparseDcsrilu02_numericBoost`| |12.2| |`hipsparseDcsrilu02_numericBoost`|3.10.0| | | | | | | | |
-|`cusparseDgpsvInterleavedBatch`|9.2| | |`hipsparseDgpsvInterleavedBatch`|5.1.0| | | | | | | | |
+|`cusparseDgpsvInterleavedBatch`|9.2| | |`hipsparseDgpsvInterleavedBatch`|5.1.0| | | |`rocsparse_dgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseDgpsvInterleavedBatch_bufferSizeExt`|9.2| | |`hipsparseDgpsvInterleavedBatch_bufferSizeExt`|5.1.0| | | | | | | | |
 |`cusparseDgtsv`| |10.2|11.0| | | | | | | | | | |
 |`cusparseDgtsv2`|9.0| | |`hipsparseDgtsv2`|4.3.0| | | | | | | | |
@@ -556,7 +556,7 @@
 |`cusparseScsrilu02_bufferSize`| |12.2| |`hipsparseScsrilu02_bufferSize`|1.9.2| | | | | | | | |
 |`cusparseScsrilu02_bufferSizeExt`| |12.2| |`hipsparseScsrilu02_bufferSizeExt`|1.9.2| | | | | | | | |
 |`cusparseScsrilu02_numericBoost`| |12.2| |`hipsparseScsrilu02_numericBoost`|3.10.0| | | | | | | | |
-|`cusparseSgpsvInterleavedBatch`|9.2| | |`hipsparseSgpsvInterleavedBatch`|5.1.0| | | | | | | | |
+|`cusparseSgpsvInterleavedBatch`|9.2| | |`hipsparseSgpsvInterleavedBatch`|5.1.0| | | |`rocsparse_sgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseSgpsvInterleavedBatch_bufferSizeExt`|9.2| | |`hipsparseSgpsvInterleavedBatch_bufferSizeExt`|5.1.0| | | | | | | | |
 |`cusparseSgtsv`| |10.2|11.0| | | | | | | | | | |
 |`cusparseSgtsv2`|9.0| | |`hipsparseSgtsv2`|4.3.0| | | | | | | | |
@@ -593,7 +593,7 @@
 |`cusparseZcsrilu02_bufferSize`| |12.2| |`hipsparseZcsrilu02_bufferSize`|3.1.0| | | | | | | | |
 |`cusparseZcsrilu02_bufferSizeExt`| |12.2| |`hipsparseZcsrilu02_bufferSizeExt`|3.1.0| | | | | | | | |
 |`cusparseZcsrilu02_numericBoost`| |12.2| |`hipsparseZcsrilu02_numericBoost`|3.10.0| | | | | | | | |
-|`cusparseZgpsvInterleavedBatch`|9.2| | |`hipsparseZgpsvInterleavedBatch`|5.1.0| | | | | | | | |
+|`cusparseZgpsvInterleavedBatch`|9.2| | |`hipsparseZgpsvInterleavedBatch`|5.1.0| | | |`rocsparse_zgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseZgpsvInterleavedBatch_bufferSizeExt`|9.2| | |`hipsparseZgpsvInterleavedBatch_bufferSizeExt`|5.1.0| | | | | | | | |
 |`cusparseZgtsv`| |10.2|11.0| | | | | | | | | | |
 |`cusparseZgtsv2`|9.0| | |`hipsparseZgtsv2`|4.3.0| | | | | | | | |

diff --git a/docs/tables/CUSPARSE_API_supported_by_ROC.md b/docs/tables/CUSPARSE_API_supported_by_ROC.md
@@ -489,7 +489,7 @@
 |`cusparseCcsrilu02_bufferSize`| |12.2| | | | | | |
 |`cusparseCcsrilu02_bufferSizeExt`| |12.2| | | | | | |
 |`cusparseCcsrilu02_numericBoost`| |12.2| | | | | | |
-|`cusparseCgpsvInterleavedBatch`|9.2| | | | | | | |
+|`cusparseCgpsvInterleavedBatch`|9.2| | |`rocsparse_cgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseCgpsvInterleavedBatch_bufferSizeExt`|9.2| | | | | | | |
 |`cusparseCgtsv`| |10.2|11.0| | | | | |
 |`cusparseCgtsv2`|9.0| | | | | | | |
@@ -523,7 +523,7 @@
 |`cusparseDcsrilu02_bufferSize`| |12.2| | | | | | |
 |`cusparseDcsrilu02_bufferSizeExt`| |12.2| | | | | | |
 |`cusparseDcsrilu02_numericBoost`| |12.2| | | | | | |
-|`cusparseDgpsvInterleavedBatch`|9.2| | | | | | | |
+|`cusparseDgpsvInterleavedBatch`|9.2| | |`rocsparse_dgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseDgpsvInterleavedBatch_bufferSizeExt`|9.2| | | | | | | |
 |`cusparseDgtsv`| |10.2|11.0| | | | | |
 |`cusparseDgtsv2`|9.0| | | | | | | |
@@ -556,7 +556,7 @@
 |`cusparseScsrilu02_bufferSize`| |12.2| | | | | | |
 |`cusparseScsrilu02_bufferSizeExt`| |12.2| | | | | | |
 |`cusparseScsrilu02_numericBoost`| |12.2| | | | | | |
-|`cusparseSgpsvInterleavedBatch`|9.2| | | | | | | |
+|`cusparseSgpsvInterleavedBatch`|9.2| | |`rocsparse_sgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseSgpsvInterleavedBatch_bufferSizeExt`|9.2| | | | | | | |
 |`cusparseSgtsv`| |10.2|11.0| | | | | |
 |`cusparseSgtsv2`|9.0| | | | | | | |
@@ -593,7 +593,7 @@
 |`cusparseZcsrilu02_bufferSize`| |12.2| | | | | | |
 |`cusparseZcsrilu02_bufferSizeExt`| |12.2| | | | | | |
 |`cusparseZcsrilu02_numericBoost`| |12.2| | | | | | |
-|`cusparseZgpsvInterleavedBatch`|9.2| | | | | | | |
+|`cusparseZgpsvInterleavedBatch`|9.2| | |`rocsparse_zgpsv_interleaved_batch`|5.1.0| | | |
 |`cusparseZgpsvInterleavedBatch_bufferSizeExt`|9.2| | | | | | | |
 |`cusparseZgtsv`| |10.2|11.0| | | | | |
 |`cusparseZgtsv2`|9.0| | | | | | | |

diff --git a/src/CUDA2HIP_SPARSE_API_functions.cpp b/src/CUDA2HIP_SPARSE_API_functions.cpp
@@ -365,6 +365,7 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseXbsric02_zeroPivot",                        {"hipsparseXbsric02_zeroPivot",                        "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
 
   // 12.2. Incomplete LU Factorization: level 0
+  // NOTE: rocsparse_(s|d|c|z)csrilu0 have different signatures
   {"cusparseScsrilu0",                                  {"hipsparseScsrilu0",                                  "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseDcsrilu0",                                  {"hipsparseDcsrilu0",                                  "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseCcsrilu0",                                  {"hipsparseCcsrilu0",                                  "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
@@ -422,11 +423,13 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseXbsrilu02_zeroPivot",                       {"hipsparseXbsrilu02_zeroPivot",                       "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED | CUDA_DEPRECATED}},
 
   // 12.3. Tridiagonal Solve
+  // NOTE: rocsparse_(s|d|c|z)gtsv have an additional parameter void* temp_buffer
   {"cusparseSgtsv",                                     {"hipsparseSgtsv",                                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseDgtsv",                                     {"hipsparseDgtsv",                                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseCgtsv",                                     {"hipsparseCgtsv",                                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseZgtsv",                                     {"hipsparseZgtsv",                                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
 
+  // NOTE: rocsparse_(s|d|c|z)gtsv_no_pivot have an additional parameter void* temp_buffer
   {"cusparseSgtsv_nopivot",                             {"hipsparseSgtsv_nopivot",                             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseDgtsv_nopivot",                             {"hipsparseDgtsv_nopivot",                             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
   {"cusparseCgtsv_nopivot",                             {"hipsparseCgtsv_nopivot",                             "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, UNSUPPORTED | CUDA_DEPRECATED | CUDA_REMOVED}},
@@ -484,11 +487,10 @@ const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   {"cusparseCgpsvInterleavedBatch_bufferSizeExt",       {"hipsparseCgpsvInterleavedBatch_bufferSizeExt",       "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
   {"cusparseZgpsvInterleavedBatch_bufferSizeExt",       {"hipsparseZgpsvInterleavedBatch_bufferSizeExt",       "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
 
-  // NOTE: rocsparse_(s|d|c|z)gpsv_interleaved_batch have an additional parameter rocsparse_int batch_stride
-  {"cusparseSgpsvInterleavedBatch",                     {"hipsparseSgpsvInterleavedBatch",                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
-  {"cusparseDgpsvInterleavedBatch",                     {"hipsparseDgpsvInterleavedBatch",                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
-  {"cusparseCgpsvInterleavedBatch",                     {"hipsparseCgpsvInterleavedBatch",                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
-  {"cusparseZgpsvInterleavedBatch",                     {"hipsparseZgpsvInterleavedBatch",                     "",                                                                 CONV_LIB_FUNC, API_SPARSE, 12, ROC_UNSUPPORTED}},
+  {"cusparseSgpsvInterleavedBatch",                     {"hipsparseSgpsvInterleavedBatch",                     "rocsparse_sgpsv_interleaved_batch",                                CONV_LIB_FUNC, API_SPARSE, 12}},
+  {"cusparseDgpsvInterleavedBatch",                     {"hipsparseDgpsvInterleavedBatch",                     "rocsparse_dgpsv_interleaved_batch",                                CONV_LIB_FUNC, API_SPARSE, 12}},
+  {"cusparseCgpsvInterleavedBatch",                     {"hipsparseCgpsvInterleavedBatch",                     "rocsparse_cgpsv_interleaved_batch",                                CONV_LIB_FUNC, API_SPARSE, 12}},
+  {"cusparseZgpsvInterleavedBatch",                     {"hipsparseZgpsvInterleavedBatch",                     "rocsparse_zgpsv_interleaved_batch",                                CONV_LIB_FUNC, API_SPARSE, 12}},
 
   // 13. cuSPARSE Matrix Reorderings Reference
   {"cusparseScsrcolor",                                 {"hipsparseScsrcolor",                                 "rocsparse_scsrcolor",                                              CONV_LIB_FUNC, API_SPARSE, 13, CUDA_DEPRECATED}},
@@ -2133,6 +2135,10 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_SPARSE_FUNCTION_VER_MAP {
   {"rocsparse_cnnz",                                     {HIP_3020, HIP_0,    HIP_0   }},
   {"rocsparse_dnnz",                                     {HIP_3020, HIP_0,    HIP_0   }},
   {"rocsparse_snnz",                                     {HIP_3020, HIP_0,    HIP_0   }},
+  {"rocsparse_zgpsv_interleaved_batch",                  {HIP_5010, HIP_0,    HIP_0   }},
+  {"rocsparse_cgpsv_interleaved_batch",                  {HIP_5010, HIP_0,    HIP_0   }},
+  {"rocsparse_dgpsv_interleaved_batch",                  {HIP_5010, HIP_0,    HIP_0   }},
+  {"rocsparse_sgpsv_interleaved_batch",                  {HIP_5010, HIP_0,    HIP_0   }},
 };
 
 const std::map<unsigned int, llvm::StringRef> CUDA_SPARSE_API_SECTION_MAP {

diff --git a/src/CUDA2HIP_Scripting.h b/src/CUDA2HIP_Scripting.h
@@ -31,6 +31,7 @@ namespace hipify {
     e_int64_t,
     e_remove_argument,
     e_add_const_argument,
+    e_add_var_argument,
     e_move_argument,
   };
 
@@ -51,8 +52,8 @@ namespace hipify {
     CastTypes castType;
     CastWarning castWarn;
     std::string constValToAdd = "";
-    unsigned moveTo = 0;
-    unsigned numberToMove = 1;
+    unsigned moveOrCopyTo = 0;
+    unsigned numberToMoveOrCopy = 1;
   };
 
   typedef std::map<unsigned, CastInfo> ArgCastMap;

diff --git a/src/HipifyAction.cpp b/src/HipifyAction.cpp
@@ -82,6 +82,10 @@ const std::string sCudnnSoftmaxBackward = "cudnnSoftmaxBackward";
 const std::string sCudnnConvolutionForward = "cudnnConvolutionForward";
 const std::string sCudnnConvolutionBackwardData = "cudnnConvolutionBackwardData";
 const std::string sCudnnRNNBackwardWeights = "cudnnRNNBackwardWeights";
+const std::string sCusparseZgpsvInterleavedBatch = "cusparseZgpsvInterleavedBatch";
+const std::string sCusparseCgpsvInterleavedBatch = "cusparseCgpsvInterleavedBatch";
+const std::string sCusparseDgpsvInterleavedBatch = "cusparseDgpsvInterleavedBatch";
+const std::string sCusparseSgpsvInterleavedBatch = "cusparseSgpsvInterleavedBatch";
 // CUDA_OVERLOADED
 const std::string sCudaEventCreate = "cudaEventCreate";
 const std::string sCudaGraphInstantiate = "cudaGraphInstantiate";
@@ -104,6 +108,7 @@ std::string getCastType(hipify::CastTypes c) {
     case e_int64_t: return s_int64_t;
     case e_remove_argument: return "";
     case e_add_const_argument: return "";
+    case e_add_var_argument: return "";
     case e_move_argument: return "";
     default: return "";
   }
@@ -381,6 +386,42 @@ std::map<std::string, ArgCastStruct> FuncArgCasts {
       true
     }
   },
+  {sCusparseZgpsvInterleavedBatch,
+    {
+      {
+        {9, {e_add_var_argument, cw_None, "", 10}}
+      },
+      true,
+      false
+    }
+  },
+  {sCusparseCgpsvInterleavedBatch,
+    {
+      {
+        {9, {e_add_var_argument, cw_None, "", 10}}
+      },
+      true,
+      false
+    }
+  },
+  {sCusparseDgpsvInterleavedBatch,
+    {
+      {
+        {9, {e_add_var_argument, cw_None, "", 10}}
+      },
+      true,
+      false
+    }
+  },
+  {sCusparseSgpsvInterleavedBatch,
+    {
+      {
+        {9, {e_add_var_argument, cw_None, "", 10}}
+      },
+      true,
+      false
+    }
+  },
 };
 
 void HipifyAction::RewriteString(StringRef s, clang::SourceLocation start) {
@@ -857,28 +898,28 @@ bool HipifyAction::cudaHostFuncCall(const mat::MatchFinder::MatchResult &Result)
           std::string sArg;
           clang::SmallString<40> dst_XStr;
           llvm::raw_svector_ostream dst_OS(dst_XStr);
-          if (c.second.numberToMove > 1) {
-            if ((argNum + c.second.numberToMove - 1) >= call->getNumArgs())
+          if (c.second.numberToMoveOrCopy > 1) {
+            if ((argNum + c.second.numberToMoveOrCopy - 1) >= call->getNumArgs())
               continue;
-            sr = call->getArg(argNum + c.second.numberToMove - 1)->getSourceRange();
+            sr = call->getArg(argNum + c.second.numberToMoveOrCopy - 1)->getSourceRange();
             sr.setBegin(call->getArg(argNum)->getBeginLoc());
           }
           sArg = readSourceText(*SM, sr).str();
-          if (c.second.moveTo < call->getNumArgs())
+          if (c.second.moveOrCopyTo < call->getNumArgs())
             dst_OS << sArg << ", ";
           else
             dst_OS << ", " << sArg;
           clang::SourceLocation dst_s;
-          if (c.second.moveTo < call->getNumArgs())
-            dst_s = call->getArg(c.second.moveTo)->getBeginLoc();
+          if (c.second.moveOrCopyTo < call->getNumArgs())
+            dst_s = call->getArg(c.second.moveOrCopyTo)->getBeginLoc();
           else
             dst_s = call->getEndLoc();
           ct::Replacement dst_Rep(*SM, dst_s, 0, dst_OS.str());
           clang::FullSourceLoc dst_fullSL(dst_s, *SM);
           insertReplacement(dst_Rep, dst_fullSL);
           OS << "";
           if (argNum < call->getNumArgs())
-            e = call->getArg(argNum + c.second.numberToMove)->getBeginLoc();
+            e = call->getArg(argNum + c.second.numberToMoveOrCopy)->getBeginLoc();
           else
             e = call->getEndLoc();
           length = SM->getCharacterData(e) - SM->getCharacterData(s);
@@ -892,6 +933,23 @@ bool HipifyAction::cudaHostFuncCall(const mat::MatchFinder::MatchResult &Result)
             OS << ", " << c.second.constValToAdd;
           break;
         }
+        case e_add_var_argument:
+        {
+          if (argNum >= call->getNumArgs())
+            continue;
+          sr = call->getArg(argNum)->getSourceRange();
+          sr.setBegin(call->getArg(argNum)->getBeginLoc());
+          std::string sArg = readSourceText(*SM, sr).str();
+          if (c.second.moveOrCopyTo < call->getNumArgs()) {
+            OS << sArg << ", ";
+            s = call->getArg(c.second.moveOrCopyTo)->getBeginLoc();
+          }
+          else {
+            OS << ", " << sArg;
+            s = call->getEndLoc();
+          }
+          break;
+        }
         default:
           OS << getCastType(c.second.castType) << "(" << readSourceText(*SM, sr) << ")";
           length = SM->getCharacterData(clang::Lexer::getLocForEndOfToken(e, 0, *SM, DefaultLangOptions)) - SM->getCharacterData(s);
@@ -1065,7 +1123,11 @@ std::unique_ptr<clang::ASTConsumer> HipifyAction::CreateASTConsumer(clang::Compi
             sCudnnSoftmaxBackward,
             sCudnnConvolutionForward,
             sCudnnConvolutionBackwardData,
-            sCudnnRNNBackwardWeights
+            sCudnnRNNBackwardWeights,
+            sCusparseZgpsvInterleavedBatch,
+            sCusparseCgpsvInterleavedBatch,
+            sCusparseDgpsvInterleavedBatch,
+            sCusparseSgpsvInterleavedBatch
           )
         )
       )