[SYCL] Implement sycl_ext_oneapi_memcpy2d extension #7370

steffenlarsen · 2022-11-11T12:21:39Z

This commit adds an implementation of the sycl_ext_oneapi_memcpy2d extension. This includes the following:

Three new PI API functions; piextUSMEnqueueFill2D, piextUSMEnqueueMemset2D, and piextUSMEnqueueMemcpy2D.
Three new PI context queries; PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT, PI_EXT_ONEAPI_CONTEXT_INFO_USM_FILL2D_SUPPORT, and PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMSET2D_SUPPORT. Each of these return a boolean value signifying if the PI context supports each of the new API functions.
New handler member functions; ext_oneapi_memcpy2d, ext_oneapi_copy2d, ext_oneapi_memset2d, and ext_oneapi_fill2d. These will create new commands which will use the new PI commands if they are supported. If the new PI API functions are not supported, these member functions will launch auxiliary kernels to do the required work.
New queue shortcuts for each of the new handler members.

This commit adds an implementation of the sycl_ext_oneapi_memcpy2d extension. This includes the following: * Three new PI API functions; piextUSMEnqueueFill2D, piextUSMEnqueueMemset2D, and piextUSMEnqueueMemcpy2D. * Three new PI context queries; PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT, PI_EXT_ONEAPI_CONTEXT_INFO_USM_FILL2D_SUPPORT, and PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMSET2D_SUPPORT. Each of these return a boolean value signifying if the PI context supports each of the new API functions. * New handler member functions; ext_oneapi_memcpy2d, ext_oneapi_copy2d, ext_oneapi_memset2d, and ext_oneapi_fill2d. These will create new commands which will use the new PI commands if they are supported. If the new PI API functions are not supported, these member functions will launch auxiliary kernels to do the required work. * New queue shortcuts for each of the new handler members. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

sycl/include/sycl/detail/cg.hpp

AlexeySachkov · 2022-11-11T12:56:57Z

sycl/include/sycl/detail/pi.h

-  PI_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES = 0x10011
+  PI_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES = 0x10011,
+  // Native 2D USM memory operation support
+  PI_EXT_ONEAPI_CONTEXT_INFO_USM_FILL2D_SUPPORT = 0x30000,


I wonder, why 0x30000 and not 0x20000, for example? Is it documented anywhere which values should be picked up for new capabilities?

I don't think we have any rules necessarily. All these values are taken from OpenCL so we normally just try and move around what values are in OpenCL when adding extension values. In theory it should be fine as long as they don't conflict with any values in the same category, but it's good to keep a buffer.

sycl/include/sycl/handler.hpp

AlexeySachkov · 2022-11-11T13:22:16Z

sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp

@@ -1930,6 +1930,23 @@ pi_result piextUSMEnqueueMemAdvise(pi_queue, const void *, size_t,
  DIE_NO_IMPLEMENTATION;
 }

+pi_result piextUSMEnqueueFill2D(pi_queue, void *, size_t, size_t, const void *,


What about get info for ESIMD Emulator plugin?

piContextGetInfo isn't implemented in the esimd_emulator, so I assume it takes another route.

sycl/unittests/Extensions/USMMemcpy2D.cpp

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen · 2022-11-11T15:05:31Z

/verify with intel/llvm-test-suite#1379

steffenlarsen · 2022-11-18T08:44:07Z

@intel/llvm-reviewers-cuda | @intel/dpcpp-esimd-reviewers | @intel/dpcpp-l0-pi-reviewers | @intel/llvm-reviewers-runtime - Friendly ping. 😄

sergey-semenov

Very minor comments aside, LGTM. @intel/dpcpp-l0-pi-reviewers Could you please take a look as well?

sycl/unittests/Extensions/USMMemcpy2D.cpp

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

againull

L0 plugin changes look good to me.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

smaslov-intel

I am temporarily blocking the merge until this is reviewed/approved for Unified Runtime

kbenzie

I've made oneapi-src/unified-runtime#83 to ensure we track these changes in the unified runtime spec.

sycl/include/sycl/detail/pi.h

Co-authored-by: Petr Vesely <veselypeta@gmail.com>

sycl/include/sycl/detail/pi.h

smaslov-intel · 2022-12-12T18:17:17Z

sycl/include/sycl/detail/pi.h

+/// \param num_events_in_waitlist is the number of events to wait on
+/// \param events_waitlist is an array of events to wait on
+/// \param event is the event that represents this operation
+__SYCL_EXPORT pi_result piextUSMEnqueueFill2D(pi_queue queue, void *ptr,


The similar "buffer" API use "Rect" instead of "2D". I think we should unify names if possible (especially for Unified Runtime). Tag @kbenzie

@veselypeta this is relevant to oneapi-src/unified-runtime#107

@smaslov-intel the difference with *Rect though is they support 2D or 3D where as this is only 2D.

Does it not make sense to add 3D for USM?

3D could make sense, that would be outside of the scope of this extension though.

I'm less sure if combining the 2D and 3D entry points into a rect entry point is the right way to go though.

if we were to split 2D/3D then maybe we should do the same to the existing Rect API four buffers
OK, this discussion belongs to Unified Runtime issue, I guess

sycl/plugins/level_zero/pi_level_zero.cpp

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen · 2022-12-13T17:50:31Z

/verify with intel/llvm-test-suite#1379

aelovikov-intel · 2022-12-13T21:41:02Z

Failures:

OpenCL:

Timed Out Tests (5):
??, also failed in intel/llvm-test-suite#1405, looks flaky
SYCL :: Basic/accessor/get_host_task_access_deduction.cpp
??, also failed in http://icl-jenkins2.sc.intel.com:8080/blue/organizations/jenkins/SYCL_CI%2Fintel%2FWin%2FTest_Suite/detail/Test_Suite/2258/pipeline/288
SYCL :: Basic/stream/stream_copies_buffer_sync.cpp

#7741
SYCL :: HostInteropTask/host-task-dependency3.cpp
SYCL :: HostInteropTask/host-task-failure.cpp

??, also failed in http://icl-jenkins2.sc.intel.com:8080/blue/organizations/jenkins/SYCL_CI%2Fintel%2FWin%2FTest_Suite/detail/Test_Suite/2260/pipeline/298/
SYCL :: Regression/unoptimized_stream.cpp

Failed Tests (2):
#7742
SYCL :: KernelAndProgram/multiple-kernel-linking.cpp

??, but I'm sure I've seen it elsewhere in the last day or two.
also failed in http://icl-jenkins2.sc.intel.com:8080/blue/organizations/jenkins/SYCL_CI%2Fintel%2FWin%2FTest_Suite/detail/Test_Suite/2260/pipeline/298/
SYCL :: XPTI/kernel/basic.cpp

Level Zero:

Timed Out Tests (2):
#7741
SYCL :: HostInteropTask/host-task-dependency3.cpp
SYCL :: HostInteropTask/host-task.cpp

Failed Tests (19):
#7745
SYCL :: Basic/group_async_copy.cpp

#7744
SYCL :: DeviceLib/imf_fp16_trivial_test.cpp
SYCL :: DeviceLib/imf_fp32_test.cpp
SYCL :: DeviceLib/imf_half_type_cast.cpp

#7743
SYCL :: Reduction/reduction_big_data.cpp
SYCL :: Reduction/reduction_nd_N_vars.cpp
SYCL :: Reduction/reduction_nd_conditional.cpp
SYCL :: Reduction/reduction_nd_dw.cpp
SYCL :: Reduction/reduction_nd_ext_half.cpp
SYCL :: Reduction/reduction_nd_lambda.cpp
SYCL :: Reduction/reduction_range_1d_dw.cpp
SYCL :: Reduction/reduction_range_1d_dw_64bit.cpp
SYCL :: Reduction/reduction_range_1d_rw.cpp
SYCL :: Reduction/reduction_range_2d_dw.cpp
SYCL :: Reduction/reduction_range_2d_rw.cpp
SYCL :: Reduction/reduction_range_3d_dw.cpp
SYCL :: Reduction/reduction_range_N_vars.cpp
SYCL :: Reduction/reduction_range_lambda.cpp
SYCL :: Reduction/reduction_usm.cpp

intel#7370 implemented the proposed sycl_ext_oneapi_memcpy2d extension. With that PR merged we can now move the extension specification to supported. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

#7370 implemented the proposed sycl_ext_oneapi_memcpy2d extension. With that PR merged we can now move the extension specification to supported. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen requested review from a team as code owners November 11, 2022 12:21

steffenlarsen requested a review from sergey-semenov November 11, 2022 12:21

steffenlarsen mentioned this pull request Nov 11, 2022

[SYCL] Add tests for 2D memory operations intel/llvm-test-suite#1379

Merged

steffenlarsen added 3 commits November 11, 2022 04:23

Fix formatting

6a2222a

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix formatting after broken clang-format

970b68a

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix PI memset signatures in HIP and CUDA plugins

62decf0

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen requested a review from a team November 11, 2022 12:40

Fix PI memset signatures in esimd_emulator plugins

f58953a

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

AlexeySachkov reviewed Nov 11, 2022

View reviewed changes

steffenlarsen added 3 commits November 11, 2022 06:09

Address comments

285ff31

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix RT ambiguity

6dde11a

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix comments in queue.hpp

24e218e

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Merge branch 'sycl' into steffen/2d_mem_ops

d9e7d00

sergey-semenov approved these changes Nov 28, 2022

View reviewed changes

sycl/unittests/Extensions/USMMemcpy2D.cpp Outdated Show resolved Hide resolved

sycl/unittests/Extensions/USMMemcpy2D.cpp Outdated Show resolved Hide resolved

steffenlarsen added 2 commits November 28, 2022 23:48

Fix unittest comments

a9b4a3b

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Merge remote-tracking branch 'intel/sycl' into steffen/2d_mem_ops

6f3ad00

againull approved these changes Dec 1, 2022

View reviewed changes

v-klochkov approved these changes Dec 1, 2022

View reviewed changes

steffenlarsen added 2 commits December 1, 2022 18:57

Merge branch 'sycl' into steffen/2d_mem_ops

eb364c9

Add windows symbols

0bd93fe

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

smaslov-intel requested changes Dec 1, 2022

View reviewed changes

kbenzie mentioned this pull request Dec 5, 2022

Support sycl_ext_oneapi_memcpy2d extension oneapi-src/unified-runtime#83

Closed

kbenzie approved these changes Dec 5, 2022

View reviewed changes

Merge remote-tracking branch 'intel/sycl' into steffen/2d_mem_ops

8e36fed

veselypeta reviewed Dec 9, 2022

View reviewed changes

sycl/include/sycl/detail/pi.h Outdated Show resolved Hide resolved

veselypeta reviewed Dec 9, 2022

View reviewed changes

sycl/include/sycl/detail/pi.h Outdated Show resolved Hide resolved

steffenlarsen and others added 4 commits December 9, 2022 03:54

Merge remote-tracking branch 'intel/sycl' into steffen/2d_mem_ops

a1a0076

Update sycl/include/sycl/detail/pi.h

cc9ac20

Co-authored-by: Petr Vesely <veselypeta@gmail.com>

Update sycl/include/sycl/detail/pi.h

5c02839

Co-authored-by: Petr Vesely <veselypeta@gmail.com>

Merge branch 'sycl' into steffen/2d_mem_ops

acbb364

smaslov-intel reviewed Dec 12, 2022

View reviewed changes

sycl/include/sycl/detail/pi.h Outdated Show resolved Hide resolved

smaslov-intel reviewed Dec 12, 2022

View reviewed changes

sycl/plugins/level_zero/pi_level_zero.cpp Show resolved Hide resolved

Do not bump major version

3ef3420

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

smaslov-intel approved these changes Dec 13, 2022

View reviewed changes

Merge branch 'sycl' into steffen/2d_mem_ops

2447cc7

pvchupin merged commit 516d411 into intel:sycl Dec 13, 2022

kbenzie mentioned this pull request Dec 14, 2022

[ur] Implement USM 2D operations oneapi-src/unified-runtime#107

Merged

steffenlarsen mentioned this pull request Dec 16, 2022

[SYCL][Docs] Move sycl_ext_oneapi_memcpy2d to supported #7810

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[SYCL] Implement sycl_ext_oneapi_memcpy2d extension #7370

[SYCL] Implement sycl_ext_oneapi_memcpy2d extension #7370

steffenlarsen commented Nov 11, 2022

AlexeySachkov Nov 11, 2022

steffenlarsen Nov 11, 2022 •

edited

Loading

AlexeySachkov Nov 11, 2022

steffenlarsen Nov 11, 2022

steffenlarsen commented Nov 11, 2022

steffenlarsen commented Nov 18, 2022

sergey-semenov left a comment

againull left a comment

smaslov-intel left a comment

kbenzie left a comment

smaslov-intel Dec 12, 2022

kbenzie Dec 13, 2022

kbenzie Dec 13, 2022

smaslov-intel Dec 13, 2022

kbenzie Dec 13, 2022

smaslov-intel Dec 13, 2022

steffenlarsen commented Dec 13, 2022

aelovikov-intel commented Dec 13, 2022 •

edited

Loading

[SYCL] Implement sycl_ext_oneapi_memcpy2d extension #7370

[SYCL] Implement sycl_ext_oneapi_memcpy2d extension #7370

Conversation

steffenlarsen commented Nov 11, 2022

Choose a reason for hiding this comment

steffenlarsen Nov 11, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

steffenlarsen commented Nov 11, 2022

steffenlarsen commented Nov 18, 2022

sergey-semenov left a comment

Choose a reason for hiding this comment

againull left a comment

Choose a reason for hiding this comment

smaslov-intel left a comment

Choose a reason for hiding this comment

kbenzie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

steffenlarsen commented Dec 13, 2022

aelovikov-intel commented Dec 13, 2022 • edited Loading

steffenlarsen Nov 11, 2022 •

edited

Loading

aelovikov-intel commented Dec 13, 2022 •

edited

Loading