From: Aart Bik <ajcbik@google.com>
Date: Fri, 26 May 2023 17:50:55 +0000 (-0700)
Subject: [mlir][sparse][gpu] fix merge conflict
X-Git-Tag: upstream/17.0.6~7031
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74e29d37157d75fba6ce528e611ad90242de56fd;p=platform%2Fupstream%2Fllvm.git

[mlir][sparse][gpu] fix merge conflict

Reviewed By: Peiming

Differential Revision: https://reviews.llvm.org/D151574
---

diff --git a/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp b/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
index c05785e..00a30d1 100644
--- a/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
+++ b/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
@@ -350,7 +350,7 @@ mgpuSpMVBufferSize(void *h, int32_t ma, void *a, void *x, void *y, int32_t dw,
   ALPHABETA(dw, alpha, beta)
   size_t bufferSize = 0;
   CUSPARSE_REPORT_IF_ERROR(
-      cusparseSpMV_bufferSize(handle, modeA, &alpha, matA, vecX, &beta, vecY,
+      cusparseSpMV_bufferSize(handle, modeA, alphap, matA, vecX, betap, vecY,
                               dtp, CUSPARSE_SPMV_ALG_DEFAULT, &bufferSize))
   return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc
 }
@@ -366,8 +366,8 @@ extern "C" MLIR_CUDA_WRAPPERS_EXPORT void mgpuSpMV(void *h, int32_t ma, void *a,
   cusparseDnVecDescr_t vecY = reinterpret_cast<cusparseDnVecDescr_t>(y);
   cudaDataType_t dtp = dataTp(dw);
   ALPHABETA(dw, alpha, beta)
-  CUSPARSE_REPORT_IF_ERROR(cusparseSpMV(handle, modeA, &alpha, matA, vecX,
-                                        &beta, vecY, dtp,
+  CUSPARSE_REPORT_IF_ERROR(cusparseSpMV(handle, modeA, alphap, matA, vecX,
+                                        betap, vecY, dtp,
                                         CUSPARSE_SPMV_ALG_DEFAULT, buf))
 }
 
@@ -384,7 +384,7 @@ mgpuSpMMBufferSize(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c,
   ALPHABETA(dw, alpha, beta)
   size_t bufferSize = 0;
   CUSPARSE_REPORT_IF_ERROR(cusparseSpMM_bufferSize(
-      handle, modeA, modeB, &alpha, matA, matB, &beta, matC, dtp,
+      handle, modeA, modeB, alphap, matA, matB, betap, matC, dtp,
       CUSPARSE_SPMM_ALG_DEFAULT, &bufferSize))
   return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc
 }
@@ -400,7 +400,7 @@ mgpuSpMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c, int32_t dw,
   cusparseDnMatDescr_t matC = reinterpret_cast<cusparseDnMatDescr_t>(c);
   cudaDataType_t dtp = dataTp(dw);
   ALPHABETA(dw, alpha, beta)
-  CUSPARSE_REPORT_IF_ERROR(cusparseSpMM(handle, modeA, modeB, &alpha, matA,
-                                        matB, &beta, matC, dtp,
+  CUSPARSE_REPORT_IF_ERROR(cusparseSpMM(handle, modeA, modeB, alphap, matA,
+                                        matB, betap, matC, dtp,
                                         CUSPARSE_SPMM_ALG_DEFAULT, buf))
 }