Skip to content

[SYCL] Adding caching when using interop constructor #3327

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
bader merged 11 commits into from
Mar 15, 2021
Merged

[SYCL] Adding caching when using interop constructor #3327

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
45e9dd8
[SYCL] Add caching into device
maximdimakov Mar 5, 2021
a20af7e
[SYCL] Add checking for weak_ptr into device
maximdimakov Mar 5, 2021
b5e45fc
[SYCL] Add caching for device and platform
maximdimakov Mar 9, 2021
1088259
[SYCL] Clang-format fix
maximdimakov Mar 9, 2021
6fdff7e
[SYCL] Clang-format fix
maximdimakov Mar 9, 2021
a88ccbd
Resolve merge conflict
maximdimakov Mar 10, 2021
5c014bd
Merge sycl into caching_interop
maximdimakov Mar 10, 2021
b72b4cf
[SYCL] Use existing caching implementation
maximdimakov Mar 11, 2021
e010395
Remove problems
maximdimakov Mar 11, 2021
89179d0
Clang-format fix
maximdimakov Mar 11, 2021
3221fc2
Adress review comment
maximdimakov Mar 12, 2021
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
1 change: 0 additions & 1 deletion sycl/include/CL/sycl/device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <CL/sycl/platform.hpp>
#include <CL/sycl/stl.hpp>

#include <memory>
Copy link
Contributor

@alexbatashev alexbatashev Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

memory was actually used for shared_ptr.

Copy link
Contributor Author

@maximdimakov maximdimakov Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was deleted when I tested map. But memory is included in stl.hpp, that included higher. Do I need to return it?

Copy link
Contributor

@bader bader Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. You can't rely on CL/sycl/stl.hpp to include memory header for you.

Copy link
Contributor Author

@maximdimakov maximdimakov Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returned it

#include <utility>

__SYCL_INLINE_NAMESPACE(cl) {
Expand Down
14 changes: 9 additions & 5 deletions sycl/source/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ void force_type(info::device_type &t, const info::device_type &ft) {

device::device() : impl(detail::device_impl::getHostDeviceImpl()) {}

device::device(cl_device_id deviceId)
: impl(std::make_shared<detail::device_impl>(
detail::pi::cast<pi_native_handle>(deviceId),
RT::getPlugin<backend::opencl>())) {
device::device(cl_device_id DeviceId) {
// The implementation constructor takes ownership of the native handle so we
// must retain it in order to adhere to SYCL 1.2.1 spec (Rev6, section 4.3.1.)
clRetainDevice(deviceId);
detail::RT::PiDevice Device;
auto Plugin = detail::RT::getPlugin<backend::opencl>();
Plugin.call<detail::PiApiKind::piextDeviceCreateWithNativeHandle>(
detail::pi::cast<pi_native_handle>(DeviceId), nullptr, &Device);
auto Platform =
detail::platform_impl::getPlatformFromPiDevice(Device, Plugin);
impl = Platform->getOrMakeDeviceImpl(Device, Platform);
clRetainDevice(DeviceId);
}

device::device(const device_selector &deviceSelector) {
Expand Down
9 changes: 5 additions & 4 deletions sycl/source/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ namespace sycl {

platform::platform() : impl(detail::platform_impl::getHostPlatformImpl()) {}

platform::platform(cl_platform_id PlatformId)
: impl(std::make_shared<detail::platform_impl>(
detail::pi::cast<detail::RT::PiPlatform>(PlatformId),
RT::getPlugin<backend::opencl>())) {}
platform::platform(cl_platform_id PlatformId) {
impl = detail::platform_impl::getOrMakePlatformImpl(
detail::pi::cast<detail::RT::PiPlatform>(PlatformId),
detail::RT::getPlugin<backend::opencl>());
}

platform::platform(const device_selector &dev_selector) {
*this = dev_selector.select_device().get_platform();
Expand Down