From 859b8e6b71a3ab8b9cf382d88702d81cfc85f393 Mon Sep 17 00:00:00 2001 From: Alexey Sachkov Date: Mon, 23 Mar 2020 18:00:06 +0300 Subject: [PATCH 1/3] [SYCL][NFC] Unify setting kernel arguments Signed-off-by: Alexey Sachkov --- sycl/source/detail/scheduler/commands.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 965285ce75ddc..328d0cb3347cd 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -1639,16 +1639,14 @@ cl_int ExecCGCommand::enqueueImp() { case kernel_param_kind_t::kind_accessor: { Requirement *Req = (Requirement *)(Arg.MPtr); AllocaCommandBase *AllocaCmd = getAllocaForReq(Req); -#if USE_PI_CUDA - pi_mem MemArg = (pi_mem)AllocaCmd->getMemAllocation(); - Plugin.call(Kernel, Arg.MIndex, &MemArg); -#else RT::PiMem MemArg = (RT::PiMem)AllocaCmd->getMemAllocation(); + if (!RT::useBackend(pi::Backend::SYCL_BE_PI_OPENCL)) { + Plugin.call(Kernel, Arg.MIndex, + &MemArg); + break; + } Plugin.call(Kernel, Arg.MIndex, sizeof(RT::PiMem), &MemArg); - Plugin.call(Kernel, Arg.MIndex, - sizeof(RT::PiMem), &MemArg); -#endif break; } case kernel_param_kind_t::kind_std_layout: { From 3d2d8304e1f38f42a430cfa7e4dafe05c7ebf151 Mon Sep 17 00:00:00 2001 From: Alexey Sachkov Date: Tue, 24 Mar 2020 18:58:47 +0300 Subject: [PATCH 2/3] [SYCL] Refactor code a bit to improve readability Signed-off-by: Alexey Sachkov --- sycl/source/detail/scheduler/commands.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 328d0cb3347cd..4249eb53b094c 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -1643,10 +1643,10 @@ cl_int ExecCGCommand::enqueueImp() { if (!RT::useBackend(pi::Backend::SYCL_BE_PI_OPENCL)) { Plugin.call(Kernel, Arg.MIndex, &MemArg); - break; + } else { + Plugin.call(Kernel, Arg.MIndex, + sizeof(RT::PiMem), &MemArg); } - Plugin.call(Kernel, Arg.MIndex, - sizeof(RT::PiMem), &MemArg); break; } case kernel_param_kind_t::kind_std_layout: { From 0b060a9dcdbd3d76888f858990e6623050e2f440 Mon Sep 17 00:00:00 2001 From: Alexey Sachkov Date: Tue, 24 Mar 2020 19:19:33 +0300 Subject: [PATCH 3/3] [SYCL] Reverse if condition Signed-off-by: Alexey Sachkov --- sycl/source/detail/scheduler/commands.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 4249eb53b094c..9b187f25a563b 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -1640,12 +1640,12 @@ cl_int ExecCGCommand::enqueueImp() { Requirement *Req = (Requirement *)(Arg.MPtr); AllocaCommandBase *AllocaCmd = getAllocaForReq(Req); RT::PiMem MemArg = (RT::PiMem)AllocaCmd->getMemAllocation(); - if (!RT::useBackend(pi::Backend::SYCL_BE_PI_OPENCL)) { - Plugin.call(Kernel, Arg.MIndex, - &MemArg); - } else { + if (RT::useBackend(pi::Backend::SYCL_BE_PI_OPENCL)) { Plugin.call(Kernel, Arg.MIndex, sizeof(RT::PiMem), &MemArg); + } else { + Plugin.call(Kernel, Arg.MIndex, + &MemArg); } break; }