This is an archive of the discontinued LLVM Phabricator instance.

Differential D151619

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

Authored by aartbik on May 27 2023, 1:39 PM.

Details

Reviewers
K-Wu
Commits
rG752c04777fde: [mlir][sparse][gpu] fix merge conflict

Diff Detail

Event Timeline

aartbik created this revision.May 27 2023, 1:39 PM
Herald added a reviewer: K-Wu. · View Herald TranscriptMay 27 2023, 1:39 PM
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 27 2023, 1:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 27 2023, 1:39 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
K-Wu accepted this revision.May 27 2023, 1:39 PM
This revision is now accepted and ready to land.May 27 2023, 1:39 PM
This revision was landed with ongoing or failed builds.May 27 2023, 1:42 PM
Closed by commit rG752c04777fde: [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: rG752c04777fde: [mlir][sparse][gpu] fix merge conflict.
Harbormaster completed remote builds in B235036: Diff 526290.May 27 2023, 1:59 PM

Revision Contents

PathSize
mlir/
lib/
ExecutionEngine/
8 lines

Diff 526291

mlir/lib/ExecutionEngine/CudaRuntimeWrappers.cpp

Show First 20 Lines • Show All 412 Lines • ▼ Show 20 LinesmgpuSDDMMBufferSize(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c,
cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb); cusparseOperation_t modeB = static_cast<cusparseOperation_t>(mb);
cusparseDnMatDescr_t matA = reinterpret_cast<cusparseDnMatDescr_t>(a); cusparseDnMatDescr_t matA = reinterpret_cast<cusparseDnMatDescr_t>(a);
cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b); cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b);
cusparseSpMatDescr_t matC = reinterpret_cast<cusparseSpMatDescr_t>(c); cusparseSpMatDescr_t matC = reinterpret_cast<cusparseSpMatDescr_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(cusparseSDDMM_bufferSize( 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)) CUSPARSE_SDDMM_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
mgpuSDDMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c, mgpuSDDMM(void *h, int32_t ma, int32_t mb, void *a, void *b, void *c,
int32_t dw, void *buf, CUstream /*stream*/) { int32_t dw, 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);
cusparseDnMatDescr_t matA = reinterpret_cast<cusparseDnMatDescr_t>(a); cusparseDnMatDescr_t matA = reinterpret_cast<cusparseDnMatDescr_t>(a);
cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b); cusparseDnMatDescr_t matB = reinterpret_cast<cusparseDnMatDescr_t>(b);
cusparseSpMatDescr_t matC = reinterpret_cast<cusparseSpMatDescr_t>(c); cusparseSpMatDescr_t matC = reinterpret_cast<cusparseSpMatDescr_t>(c);
cudaDataType_t dtp = dataTp(dw); cudaDataType_t dtp = dataTp(dw);
ALPHABETA(dw, alpha, beta) ALPHABETA(dw, alpha, beta)
CUSPARSE_REPORT_IF_ERROR(cusparseSDDMM(handle, modeA, modeB, &alpha, matA, CUSPARSE_REPORT_IF_ERROR(cusparseSDDMM(handle, modeA, modeB, alphap, matA,
matB, &beta, matC, dtp, matB, betap, matC, dtp,
CUSPARSE_SDDMM_ALG_DEFAULT, buf)) CUSPARSE_SDDMM_ALG_DEFAULT, buf))
} }
No newline at end of file