Skip to content

[SYCL] Fix kernel program cache for multiple devices and refactor some unit tests #5017

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 20 commits into from
Jan 11, 2022
Merged

[SYCL] Fix kernel program cache for multiple devices and refactor some unit tests #5017

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7bf586c
Fix kernel program cache for multiple devices
maximdimakov Nov 23, 2021
a042881
Clang-format fix
maximdimakov Nov 23, 2021
8458b5e
Merge remote-tracking branch 'origin/sycl' into fix_CP_cache
maximdimakov Dec 9, 2021
deaa97c
Add unittest for the fix
maximdimakov Dec 9, 2021
ab22f7c
Clang-format fix
maximdimakov Dec 9, 2021
c248f7d
Make test only for opencl backend
maximdimakov Dec 9, 2021
ca3c7dd
Clang-format fix
maximdimakov Dec 9, 2021
1aa4a39
Fixed problem with kernel release
maximdimakov Dec 10, 2021
5674a12
Use size_t for reinterpret_cast
maximdimakov Dec 10, 2021
a718e3f
Fix fail on windows
maximdimakov Dec 14, 2021
30db943
Clang-format
maximdimakov Dec 14, 2021
004c9d5
Addressed review comments
maximdimakov Dec 16, 2021
eb5abfb
Clang-format fix
maximdimakov Dec 16, 2021
bc4be30
Add more clarifying comment
maximdimakov Dec 19, 2021
a530172
Clang-format fix
maximdimakov Dec 20, 2021
034d92c
Merge remote-tracking branch 'origin/sycl' into fix_CP_cache
maximdimakov Jan 10, 2022
b3f60a1
[SYCL][NFC] Don't include sycl.hpp from headers
bader Dec 28, 2021
cb440dc
[SYCL][NFC] Factor out empty kernel creation boilerplate
bader Dec 28, 2021
ed4811e
Refactor some tests
maximdimakov Jan 10, 2022
ad007d9
Clang-format fix
maximdimakov Jan 10, 2022
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: 1 addition & 0 deletions sycl/source/detail/kernel_program_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ KernelProgramCache::~KernelProgramCache() {
Plugin.call<PiApiKind::piKernelRelease>(Kern);
}
}
MKernelsPerProgramCache.erase(KernIt);
}

const detail::plugin &Plugin = MParentContext->getPlugin();
Expand Down
7 changes: 5 additions & 2 deletions sycl/source/detail/program_manager/program_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,7 +1799,11 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
// Cache supports key with once device only, but here we have multiple
// devices a program is built for, so add the program to the cache for all
// other devices.
auto CacheOtherDevices = [ResProgram]() { return ResProgram; };
const detail::plugin &Plugin = ContextImpl->getPlugin();
auto CacheOtherDevices = [ResProgram, &Plugin]() {
Plugin.call<PiApiKind::piProgramRetain>(ResProgram);
return ResProgram;
};

// The program for device "0" is already added to the cache during the first
// call to getOrBuild, so starting with "1"
Expand All @@ -1817,7 +1821,6 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
// devive_image_impl shares ownership of PIProgram with, at least, program
// cache. The ref counter will be descremented in the destructor of
// device_image_impl
const detail::plugin &Plugin = ContextImpl->getPlugin();
Plugin.call<PiApiKind::piProgramRetain>(ResProgram);

DeviceImageImplPtr ExecImpl = std::make_shared<detail::device_image_impl>(
Expand Down