From: Aart Bik <ajcbik@google.com>
Date: Sat, 27 May 2023 20:38:36 +0000 (-0700)
Subject: [mlir][sparse][gpu] fix merge conflict
X-Git-Tag: upstream/17.0.6~6956
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=752c04777fde03a2a93f6c43082059fe8b639b07;p=platform%2Fupstream%2Fllvm.git

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

Reviewed By: K-Wu

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

diff --git a/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp b/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
index a87834e..f928f32 100644
--- a/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
+++ b/mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp
@@ -418,7 +418,7 @@ mgpuSDDMMBufferSize(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(cusparseSDDMM_bufferSize(
-      handle, modeA, modeB, &alpha, matA, matB, &beta, matC, dtp,
+      handle, modeA, modeB, alphap, matA, matB, betap, matC, dtp,
       CUSPARSE_SDDMM_ALG_DEFAULT, &bufferSize))
   return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc
 }
@@ -434,7 +434,7 @@ mgpuSDDMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c,
   cusparseSpMatDescr_t matC = reinterpret_cast<cusparseSpMatDescr_t>(c);
   cudaDataType_t dtp = dataTp(dw);
   ALPHABETA(dw, alpha, beta)
-  CUSPARSE_REPORT_IF_ERROR(cusparseSDDMM(handle, modeA, modeB, &alpha, matA,
-                                         matB, &beta, matC, dtp,
+  CUSPARSE_REPORT_IF_ERROR(cusparseSDDMM(handle, modeA, modeB, alphap, matA,
+                                         matB, betap, matC, dtp,
                                          CUSPARSE_SDDMM_ALG_DEFAULT, buf))
-}
\ No newline at end of file
+}