This is an archive of the discontinued LLVM Phabricator instance.

Differential D151574

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

Authored by aartbik on May 26 2023, 10:51 AM.

Details

Reviewers
K-Wu
Peiming
burmako
Commits
rG74e29d37157d: [mlir][sparse][gpu] fix merge conflict

Diff Detail

Event Timeline

aartbik created this revision.May 26 2023, 10:51 AM
Herald added a reviewer: K-Wu. · View Herald TranscriptMay 26 2023, 10:51 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: K-Wu, bviyer, Moerafaat and 21 others. · View Herald Transcript
aartbik requested review of this revision.May 26 2023, 10:51 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 26 2023, 10:51 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Peiming accepted this revision.May 26 2023, 10:58 AM
This revision is now accepted and ready to land.May 26 2023, 10:58 AM
aartbik added a reviewer: burmako.May 26 2023, 10:58 AM
This revision was landed with ongoing or failed builds.May 26 2023, 11:00 AM
Closed by commit rG74e29d37157d: [mlir][sparse][gpu] fix merge conflict (authored by aartbik). · Explain Why
This revision was automatically updated to reflect the committed changes.
aartbik added a commit: rG74e29d37157d: [mlir][sparse][gpu] fix merge conflict.
Harbormaster completed remote builds in B234908: Diff 526125.May 26 2023, 11:42 AM

Revision Contents

PathSize
mlir/
lib/
ExecutionEngine/
12 lines

Diff 526125

mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp

Show First 20 Lines • Show All 344 Lines • ▼ Show 20 LinesmgpuSpMVBufferSize(void *h, int32_t ma, void *a, void *x, void *y, int32_t dw,
cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma); cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma);
cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a); cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a);
cusparseDnVecDescr_t vecX = reinterpret_cast<cusparseDnVecDescr_t>(x); cusparseDnVecDescr_t vecX = reinterpret_cast<cusparseDnVecDescr_t>(x);
cusparseDnVecDescr_t vecY = reinterpret_cast<cusparseDnVecDescr_t>(y); cusparseDnVecDescr_t vecY = reinterpret_cast<cusparseDnVecDescr_t>(y);
cudaDataType_t dtp = dataTp(dw); cudaDataType_t dtp = dataTp(dw);
ALPHABETA(dw, alpha, beta) ALPHABETA(dw, alpha, beta)
size_t bufferSize = 0; size_t bufferSize = 0;
CUSPARSE_REPORT_IF_ERROR( 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)) dtp, CUSPARSE_SPMV_ALG_DEFAULT, &bufferSize))
return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc
} }
extern "C" MLIR_CUDA_WRAPPERS_EXPORT void mgpuSpMV(void *h, int32_t ma, void *a, extern "C" MLIR_CUDA_WRAPPERS_EXPORT void mgpuSpMV(void *h, int32_t ma, void *a,
void *x, void *y, int32_t dw, void *x, void *y, int32_t dw,
void *buf, void *buf,
CUstream /*stream*/) { CUstream /*stream*/) {
cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h); cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h);
cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma); cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma);
cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a); cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a);
cusparseDnVecDescr_t vecX = reinterpret_cast<cusparseDnVecDescr_t>(x); cusparseDnVecDescr_t vecX = reinterpret_cast<cusparseDnVecDescr_t>(x);
cusparseDnVecDescr_t vecY = reinterpret_cast<cusparseDnVecDescr_t>(y); cusparseDnVecDescr_t vecY = reinterpret_cast<cusparseDnVecDescr_t>(y);
cudaDataType_t dtp = dataTp(dw); cudaDataType_t dtp = dataTp(dw);
ALPHABETA(dw, alpha, beta) ALPHABETA(dw, alpha, beta)
CUSPARSE_REPORT_IF_ERROR(cusparseSpMV(handle, modeA, &alpha, matA, vecX, CUSPARSE_REPORT_IF_ERROR(cusparseSpMV(handle, modeA, alphap, matA, vecX,
&beta, vecY, dtp, betap, vecY, dtp,
CUSPARSE_SPMV_ALG_DEFAULT, buf)) CUSPARSE_SPMV_ALG_DEFAULT, buf))
} }
extern "C" MLIR_CUDA_WRAPPERS_EXPORT intptr_t extern "C" MLIR_CUDA_WRAPPERS_EXPORT intptr_t
mgpuSpMMBufferSize(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c, mgpuSpMMBufferSize(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c,
int32_t dw, CUstream /*stream*/) { int32_t dw, CUstream /*stream*/) {
cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h); cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h);
cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma); cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma);
cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb); cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb);
cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a); cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a);
cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b); cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b);
cusparseDnMatDescr_t matC = reinterpret_cast<cusparseDnMatDescr_t>(c); cusparseDnMatDescr_t matC = reinterpret_cast<cusparseDnMatDescr_t>(c);
cudaDataType_t dtp = dataTp(dw); cudaDataType_t dtp = dataTp(dw);
ALPHABETA(dw, alpha, beta) ALPHABETA(dw, alpha, beta)
size_t bufferSize = 0; size_t bufferSize = 0;
CUSPARSE_REPORT_IF_ERROR(cusparseSpMM_bufferSize( 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)) CUSPARSE_SPMM_ALG_DEFAULT, &bufferSize))
return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc return bufferSize == 0 ? 1 : bufferSize; // avoid zero-alloc
} }
extern "C" MLIR_CUDA_WRAPPERS_EXPORT void extern "C" MLIR_CUDA_WRAPPERS_EXPORT void
mgpuSpMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c, int32_t dw, mgpuSpMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c, int32_t dw,
void *buf, CUstream /*stream*/) { void *buf, CUstream /*stream*/) {
cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h); cusparseHandle_t handle = reinterpret_cast<cusparseHandle_t>(h);
cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma); cusparseOperation_t modeA = static_cast<cusparseOperation_t>(ma);
cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb); cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb);
cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a); cusparseSpMatDescr_t matA = reinterpret_cast<cusparseSpMatDescr_t>(a);
cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b); cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b);
cusparseDnMatDescr_t matC = reinterpret_cast<cusparseDnMatDescr_t>(c); cusparseDnMatDescr_t matC = reinterpret_cast<cusparseDnMatDescr_t>(c);
cudaDataType_t dtp = dataTp(dw); cudaDataType_t dtp = dataTp(dw);
ALPHABETA(dw, alpha, beta) ALPHABETA(dw, alpha, beta)
CUSPARSE_REPORT_IF_ERROR(cusparseSpMM(handle, modeA, modeB, &alpha, matA, CUSPARSE_REPORT_IF_ERROR(cusparseSpMM(handle, modeA, modeB, alphap, matA,
matB, &beta, matC, dtp, matB, betap, matC, dtp,
CUSPARSE_SPMM_ALG_DEFAULT, buf)) CUSPARSE_SPMM_ALG_DEFAULT, buf))
} }