gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BLAS: Added row-major support and tests

Browse Source
This commit is contained in:
Philippe Tillet
2015-06-27 15:22:26 -04:00
parent 8f19d2a69c
commit 3525edd54c
4 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/wrap/clBLAS.cpp
View File

@@ -153,6 +153,10 @@ extern "C"
cl_uint numCommandQueues, cl_command_queue *commandQueues,\
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *events)\
{\
if(order==clblasRowMajor){\
std::swap(M, N);\
transA = (transA==clblasTrans)?clblasNoTrans:clblasTrans;\
}\
is::int_t As1 = M, As2 = N;\
if(transA==clblasTrans) std::swap(As1, As2);\
is::array A(As1, As2, TYPE_ISAAC, cl::Buffer(mA), offA, lda);\
@@ -165,7 +169,7 @@ extern "C"
clRetainMemObject(my);\
\
is::driver::Context const & context = A.context();\
if((transA==clblasTrans) ^ (order==clblasRowMajor))\
if(transA==clblasTrans)\
execute(is::detail::assign(y, alpha*dot(A.T(), x) + beta*y), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
else\
execute(is::detail::assign(y, alpha*dot(A, x) + beta*y), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
@@ -181,12 +185,22 @@ extern "C"
#define MAKE_GEMM(TYPE_CHAR, TYPE_ISAAC, TYPE_CL) \
clblasStatus clblas ## TYPE_CHAR ## gemm(clblasOrder order, clblasTranspose transA, clblasTranspose transB,\
size_t M, size_t N, size_t K,\
TYPE_CL alpha, const cl_mem mA, size_t offA, size_t lda,\
const cl_mem mB, size_t offB, size_t ldb, TYPE_CL beta,\
TYPE_CL alpha, const cl_mem cmA, size_t offA, size_t lda,\
const cl_mem cmB, size_t offB, size_t ldb, TYPE_CL beta,\
cl_mem mC, size_t offC, size_t ldc,\
cl_uint numCommandQueues, cl_command_queue *commandQueues,\
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *events)\
{\
cl_mem mA = cmA;\
cl_mem mB = cmB;\
if(order==clblasRowMajor){\
std::swap(mA, mB);\
std::swap(offA, offB);\
std::swap(lda, ldb);\
std::swap(M, N);\
transA = (transA==clblasTrans)?clblasNoTrans:clblasTrans;\
transB = (transB==clblasTrans)?clblasNoTrans:clblasTrans;\
}\
is::int_t As1 = M, As2 = K;\
is::int_t Bs1 = K, Bs2 = N;\
if(transA==clblasTrans) std::swap(As1, As2);\
@@ -199,15 +213,13 @@ extern "C"
is::array C(M, N, TYPE_ISAAC, cl::Buffer(mC), offC, ldc);\
clRetainMemObject(mC);\
is::driver::Context const & context = C.context();\
bool AeffTrans = (transA==clblasTrans) ^ (order==clblasRowMajor);\
bool BeffTrans = (transB==clblasTrans) ^ (order==clblasRowMajor);\
/*Operation*/\
if(AeffTrans && BeffTrans){\
if((transA==clblasTrans) && (transB==clblasTrans)){\
execute(is::detail::assign(C, alpha*dot(A.T(), B.T()) + beta*C), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
}\
else if(AeffTrans && !BeffTrans)\
else if((transA==clblasTrans) && (transB==clblasNoTrans))\
execute(is::detail::assign(C, alpha*dot(A.T(), B) + beta*C), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
else if(!AeffTrans && BeffTrans)\
else if((transA==clblasNoTrans) && (transB==clblasTrans))\
execute(is::detail::assign(C, alpha*dot(A, B.T()) + beta*C), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
else\
execute(is::detail::assign(C, alpha*dot(A, B) + beta*C), context, numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\