Skip to content

[SYCL][OpenCL] Port OpenCL plugin to Unified Runtime #10490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 53 commits into from
Oct 13, 2023
Merged

[SYCL][OpenCL] Port OpenCL plugin to Unified Runtime #10490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
5211257
[SYCL][OpenCL] Create OpenCL adapter. Port Platform, Context and Devi…
fabiomestre May 17, 2023
2843f0a
[SYCL][OpenCL] Port Memory endpoints from PI to UR.
martygrant May 23, 2023
6c4a6ef
[SYCL][OpenCL] Fix failing e2e tests from memory endpoints.
martygrant May 30, 2023
1d82dba
[SYCL][PI][OpenCL][UR] Port Image and Sampler
May 25, 2023
fc49630
[SYCL][OpenCL] Rename `cl` namespace to `cl_adapter` to avoid ambiguity
callumfare Jun 1, 2023
98c25b9
[SYCL][OpenCL] Port USM entry points to UR
callumfare May 26, 2023
def7a17
Update UR to a more recent version
fabiomestre May 22, 2023
7b9c541
Port Program API's from PI to UR
fabiomestre May 23, 2023
7cfd02b
Port Kernel API's from PI to UR
fabiomestre May 24, 2023
1a10647
Fix handling of UR_KERNEL_SUB_GROUP_INFO_MAX_SUB_GROUP_SIZE
callumfare Jun 2, 2023
a023600
[SYCL][OpenCL] Port enqueue entry points to UR
callumfare Jun 6, 2023
dcb2304
[SYCL][OpenCL] Port Queue and Event to UR.
martygrant Jun 6, 2023
630d7cd
[SYCL][OpenCL] Port piPluginGetBackendOption, piGetDeviceAndHostTimer…
martygrant Jun 8, 2023
afc9fea
[OpenCL] Multiple fixes after rebasing
fabiomestre Jul 3, 2023
e6e012b
[OpenCL] Rebase opencl adapter
fabiomestre Jul 5, 2023
c4007b7
[SYCL][OpenCL] Address review comments on the rebase
fabiomestre Jul 5, 2023
b5dca2a
[SYCL][OpenCL] Port piextGetDeviceFunctionPointer and piextDeviceSele…
martygrant Jul 5, 2023
7120019
[SYCL][OpenCL] Cleanup error messages and remove urGetLastResult
fabiomestre Jul 6, 2023
381356c
[SYCL][OpenCL] Change variable naming to match LLVM Coding Style guid…
fabiomestre Jul 11, 2023
59857f1
[SYCL][OpenCL] Cleanup code and address common review feedback
fabiomestre Jul 17, 2023
c94338a
[SYCL][OpenCL] Fix issues after rebase and format cmakefile
fabiomestre Jul 19, 2023
d7669ce
[SYCL][OpenCL] Remove change to e2e test from the OpenCL port
fabiomestre Jul 19, 2023
6dccfea
[SYCL][OpenCL] Port USM import and export entrypoints
fabiomestre Jul 20, 2023
1af8f81
Merge branch 'fabio/opencl_usm_import' into 'opencl_ur_port'
fabiomestre Jul 20, 2023
da8e170
[SYCL][OpenCL] Fix ABI break and add image entrypoints to the adapter
fabiomestre Jul 21, 2023
cb230a0
Merge branch 'fabio/fix_upstream_ci_errors' into 'opencl_ur_port'
fabiomestre Jul 21, 2023
ae105a8
[SYCL][OpenCL] Multiple fixes:
fabiomestre Jul 21, 2023
b1ab51f
Merge branch 'fabio/fix_interop' into 'opencl_ur_port'
fabiomestre Jul 25, 2023
58359a7
Merge remote-tracking branch 'mirror/sycl' into opencl_ur_port
fabiomestre Aug 8, 2023
5d581b2
[SYCL][OpenCL] Address upstream review comments
fabiomestre Aug 9, 2023
3965dee
Merge branch 'fabio/opencl_address_review_comments' into 'fabio/merge…
fabiomestre Aug 9, 2023
4d865cd
Merge branch 'fabio/merge_sycl_to_opencl_port' into 'opencl_ur_port'
fabiomestre Aug 9, 2023
9c9fbe0
[SYCL][OpenCL] Remove Sycl and PI dependencies from the OpenCL adapter
fabiomestre Aug 18, 2023
4e16092
Merge branch 'fabio/opencl_remove_dependencies' into 'opencl_ur_port'
fabiomestre Aug 18, 2023
0bfccc3
Merge remote-tracking branch 'mirror/sycl' into opencl_ur_port
fabiomestre Aug 18, 2023
b13c628
Merge remote-tracking branch 'origin/sycl' into opencl_ur_port
fabiomestre Sep 14, 2023
89a75d6
Add support for urKernelSetArgLocal
fabiomestre Sep 14, 2023
b3ad97d
[SYCL][OpenCL] Fix urProgramGetBuildInfo
fabiomestre Sep 15, 2023
55c6589
Merge remote-tracking branch 'origin/sycl' into opencl_ur_port
fabiomestre Sep 15, 2023
77fc923
[SYCL][OpenCL] Remove urInit and urTearDown. Fix naming of commandbuf…
fabiomestre Sep 18, 2023
3cc3b44
Merge branch 'fabio/rebase_opencl_17_sep' into 'opencl_ur_port'
fabiomestre Sep 18, 2023
ff91877
Update urQueueCreate to check for nullptr properties
fabiomestre Sep 18, 2023
be9697b
[SYCL][OpenCL] Port PI_QUEUED changes from PI to UR
fabiomestre Sep 19, 2023
09d9c72
Merge branch 'fabio/bring_back_hack' into 'opencl_ur_port'
fabiomestre Sep 19, 2023
b13168c
Merge remote-tracking branch 'personal-fork/opencl_ur_port' into open…
fabiomestre Sep 19, 2023
c4aebe1
Merge remote-tracking branch 'origin/sycl' into opencl_ur_port
fabiomestre Sep 19, 2023
3a0a7c5
[SYCL][OpenCL] Port ESIMD support query from PI to UR
fabiomestre Sep 19, 2023
1670ab7
Merge branch 'fabio/add_esimd_device_query' into 'opencl_ur_port'
fabiomestre Sep 19, 2023
f98bcf2
Merge remote-tracking branch 'origin/sycl' into opencl_ur_port
fabiomestre Oct 12, 2023
958b75e
Revert "[SYCL][OpenCL] Remove urInit and urTearDown. Fix naming of co…
fabiomestre Oct 12, 2023
68378a9
Add if condition to level-zero
fabiomestre Oct 12, 2023
7b0a137
Merge remote-tracking branch 'origin/sycl' into opencl_ur_port
fabiomestre Oct 12, 2023
8279d9e
Fix bug introduced during merge conflict
fabiomestre Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sycl/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default")
endif()

# level_zero plugin depends today on unified_runtime plugin
# level_zero and opencl plugins depend today on unified_runtime plugin
# and unified_runtime plugin is not an independent plugin, adding it explicitly
if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS)
if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS OR "opencl" IN_LIST SYCL_ENABLE_PLUGINS)
add_subdirectory(unified_runtime)
endif()

Expand Down
32 changes: 32 additions & 0 deletions sycl/plugins/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,41 @@

add_sycl_plugin(opencl
SOURCES
# Some code is shared with the UR adapter
"../unified_runtime/pi2ur.hpp"
"../unified_runtime/pi2ur.cpp"
"../unified_runtime/ur/ur.hpp"
"../unified_runtime/ur/ur.cpp"
"../unified_runtime/ur/adapters/opencl/adapter.cpp"
"../unified_runtime/ur/adapters/opencl/adapter.hpp"
"../unified_runtime/ur/adapters/opencl/common.cpp"
"../unified_runtime/ur/adapters/opencl/common.hpp"
"../unified_runtime/ur/adapters/opencl/context.cpp"
"../unified_runtime/ur/adapters/opencl/context.hpp"
"../unified_runtime/ur/adapters/opencl/device.cpp"
"../unified_runtime/ur/adapters/opencl/device.hpp"
"../unified_runtime/ur/adapters/opencl/enqueue.cpp"
"../unified_runtime/ur/adapters/opencl/image.cpp"
"../unified_runtime/ur/adapters/opencl/kernel.cpp"
"../unified_runtime/ur/adapters/opencl/platform.cpp"
"../unified_runtime/ur/adapters/opencl/platform.hpp"
"../unified_runtime/ur/adapters/opencl/sampler.cpp"
"../unified_runtime/ur/adapters/opencl/memory.cpp"
"../unified_runtime/ur/adapters/opencl/usm.cpp"
"../unified_runtime/ur/adapters/opencl/program.cpp"
"../unified_runtime/ur/adapters/opencl/event.cpp"
"../unified_runtime/ur/adapters/opencl/queue.cpp"
"../unified_runtime/ur/adapters/opencl/command_buffer.hpp"
"../unified_runtime/ur/adapters/opencl/command_buffer.cpp"
"../unified_runtime/ur/adapters/opencl/usm_p2p.cpp"
# ---
"${sycl_inc_dir}/sycl/detail/pi.h"
"pi_opencl.cpp"
INCLUDE_DIRS
${sycl_inc_dir}
${CMAKE_CURRENT_SOURCE_DIR}/../unified_runtime
LIBRARIES
UnifiedRuntime-Headers
OpenCL-ICD
)

Expand Down
Loading