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

Driver: Fixed issue in ownership handling for BLAS

Browse Source
This commit is contained in:
Philippe Tillet
2015-07-26 21:13:28 -07:00
parent 16d381dfc6
commit 4715723e61
18 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/wrap/clBLAS.cpp
View File

@@ -28,9 +28,7 @@ extern "C"
for(cl_uint i = 0 ; i < numCommandQueues ; ++i)
{
std::list<is::driver::Event> levents;
is::driver::CommandQueue queue(commandQueues[i]);
clRetainCommandQueue(commandQueues[i]);
is::execution_options_type options(queue, &levents, &waitlist);
is::execution_options_type options(is::driver::CommandQueue(commandQueues[i],false), &levents, &waitlist);
is::execute(is::control(operation, options), is::models(options.queue(context)));
if(events)
{
@@ -54,10 +52,8 @@ extern "C"
cl_uint numEventsInWaitList, const cl_event *eventWaitList, \
cl_event *events) \
{ \
is::array x(N, TYPE_ISAAC, mx, offx, incx); \
clRetainMemObject(mx); \
is::array y(N, TYPE_ISAAC, my, offy, incy); \
clRetainMemObject(my); \
is::array x(N, TYPE_ISAAC, is::driver::Buffer(mx,false), offx, incx); \
is::array y(N, TYPE_ISAAC, is::driver::Buffer(my,false), offy, incy); \
execute(is::assign(y, alpha*x + y), y.context(), numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events); \
return clblasSuccess; \
}
@@ -72,8 +68,7 @@ extern "C"
cl_uint numCommandQueues, cl_command_queue *commandQueues,\
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *events)\
{\
is::array x(N, TYPE_ISAAC, mx, offx, incx);\
clRetainMemObject(mx);\
is::array x(N, TYPE_ISAAC, is::driver::Buffer(mx,false), offx, incx);\
execute(is::assign(x, alpha*x), x.context(), numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
return clblasSuccess;\
}
@@ -89,10 +84,8 @@ extern "C"
cl_uint numCommandQueues, cl_command_queue *commandQueues,\
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *events)\
{\
const is::array x(N, TYPE_ISAAC, mx, offx, incx);\
clRetainMemObject(mx);\
is::array y(N, TYPE_ISAAC, my, offy, incy);\
clRetainMemObject(my);\
const is::array x(N, TYPE_ISAAC, is::driver::Buffer(mx, false), offx, incx);\
is::array y(N, TYPE_ISAAC, is::driver::Buffer(my, false), offy, incy);\
execute(is::assign(y, x), y.context(), numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
return clblasSuccess;\
}
@@ -109,12 +102,9 @@ extern "C"
cl_command_queue *commandQueues, cl_uint numEventsInWaitList, \
const cl_event *eventWaitList, cl_event *events) \
{ \
is::array x(N, TYPE_ISAAC, mx, offx, incx); \
clRetainMemObject(mx); \
is::array y(N, TYPE_ISAAC, my, offy, incy); \
clRetainMemObject(my); \
is::scalar s(TYPE_ISAAC, dotProduct, offDP); \
clRetainMemObject(dotProduct); \
is::array x(N, TYPE_ISAAC, is::driver::Buffer(mx, false), offx, incx); \
is::array y(N, TYPE_ISAAC, is::driver::Buffer(my, false), offy, incy); \
is::scalar s(TYPE_ISAAC, is::driver::Buffer(dotProduct, false), offDP); \
execute(is::assign(s, dot(x,y)), s.context(), numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events); \
return clblasSuccess; \
}
@@ -129,10 +119,8 @@ extern "C"
cl_mem /*scratchBuff*/, cl_uint numCommandQueues, cl_command_queue *commandQueues,\
cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *events)\
{\
is::array x(N, TYPE_ISAAC, mx, offx, incx);\
clRetainMemObject(mx);\
is::scalar s(TYPE_ISAAC, asum, offAsum);\
clRetainMemObject(asum);\
is::array x(N, TYPE_ISAAC, is::driver::Buffer(mx, false), offx, incx);\
is::scalar s(TYPE_ISAAC, is::driver::Buffer(asum, false), offAsum);\
execute(is::assign(s, sum(abs(x))), s.context(), numCommandQueues, commandQueues, numEventsInWaitList, eventWaitList, events);\
return clblasSuccess;\
}
@@ -156,15 +144,12 @@ extern "C"
std::swap(M, N);\
transA = (transA==clblasTrans)?clblasNoTrans:clblasTrans;\
}\
is::array A(M, N, TYPE_ISAAC, mA, offA, lda);\
clRetainMemObject(mA);\
is::array A(M, N, TYPE_ISAAC, is::driver::Buffer(mA, false), offA, lda);\
\
is::int_t sx = N, sy = M;\
if(transA) std::swap(sx, sy);\
is::array x(sx, TYPE_ISAAC, mx, offx, incx);\
clRetainMemObject(mx);\
is::array y(sy, TYPE_ISAAC, my, offy, incy);\
clRetainMemObject(my);\
is::array x(sx, TYPE_ISAAC, is::driver::Buffer(mx, false), offx, incx);\
is::array y(sy, TYPE_ISAAC, is::driver::Buffer(my, false), offy, incy);\
\
is::driver::Context const & context = A.context();\
if(transA==clblasTrans)\
@@ -204,12 +189,9 @@ extern "C"
if(transA==clblasTrans) std::swap(As1, As2);\
if(transB==clblasTrans) std::swap(Bs1, Bs2);\
/*Struct*/\
is::array A(As1, As2, TYPE_ISAAC, mA, offA, lda);\
clRetainMemObject(mA);\
is::array B(Bs1, Bs2, TYPE_ISAAC, mB, offB, ldb);\
clRetainMemObject(mB);\
is::array C(M, N, TYPE_ISAAC, mC, offC, ldc);\
clRetainMemObject(mC);\
is::array A(As1, As2, TYPE_ISAAC, is::driver::Buffer(mA, false), offA, lda);\
is::array B(Bs1, Bs2, TYPE_ISAAC, is::driver::Buffer(mB, false), offB, ldb);\
is::array C(M, N, TYPE_ISAAC, is::driver::Buffer(mC, false), offC, ldc);\
is::driver::Context const & context = C.context();\
/*Operation*/\
if((transA==clblasTrans) && (transB==clblasTrans))\