Skip to content

[SYCL] Propagate data from handler to DeviceKernelInfo when using old binaries #19993

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 2 commits into from
Sep 8, 2025
Merged

[SYCL] Propagate data from handler to DeviceKernelInfo when using old binaries #19993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f303575
initIfEmpty
aelovikov-intel Sep 5, 2025
37be97f
asserts
aelovikov-intel Sep 5, 2025
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
10 changes: 7 additions & 3 deletions sycl/source/detail/device_kernel_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ void DeviceKernelInfo::init(KernelNameStrRefT KernelName) {
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
void DeviceKernelInfo::initIfNeeded(KernelNameStrRefT KernelName) {
if (!MInitialized.load())
init(KernelName);
void DeviceKernelInfo::initIfEmpty(const CompileTimeKernelInfoTy &Info) {
if (MInitialized.load())
return;

CompileTimeKernelInfoTy::operator=(Info);
Name = Info.Name.data();
init(Name.data());
}
#endif

Expand Down
3 changes: 2 additions & 1 deletion sycl/source/detail/device_kernel_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ class DeviceKernelInfo : public CompileTimeKernelInfoTy {

void init(KernelNameStrRefT KernelName);
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
void initIfNeeded(KernelNameStrRefT KernelName);
// Initialize default-created entry that has no data recorded:
void initIfEmpty(const CompileTimeKernelInfoTy &Info);
#endif
void setCompileTimeInfoIfNeeded(const CompileTimeKernelInfoTy &Info);

Expand Down
23 changes: 22 additions & 1 deletion sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,14 @@ event handler::finalize() {
if (type == detail::CGType::Kernel) {
if (impl->MDeviceKernelInfoPtr) {
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
impl->MDeviceKernelInfoPtr->initIfNeeded(toKernelNameStrT(MKernelName));
detail::CompileTimeKernelInfoTy HandlerInfo;
HandlerInfo.Name = MKernelName;
HandlerInfo.NumParams = impl->MKernelNumArgs;
HandlerInfo.ParamDescGetter = impl->MKernelParamDescGetter;
HandlerInfo.IsESIMD = impl->MKernelIsESIMD;
HandlerInfo.HasSpecialCaptures = impl->MKernelHasSpecialCaptures;

impl->MDeviceKernelInfoPtr->initIfEmpty(HandlerInfo);
#endif
} else {
// Fetch the device kernel info pointer if it hasn't been set (e.g.
Expand All @@ -553,6 +560,20 @@ event handler::finalize() {
&detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
toKernelNameStrT(MKernelName));
}

detail::DeviceKernelInfo &Info = *impl->MDeviceKernelInfoPtr;
(void)Info;

// Make sure that information set by old binaries gets properly copied to
// the `DeviceKernelInfo` so that the rest of the code base could use it as
// the single source of all the data:
assert(MKernelName == static_cast<std::string_view>(Info.Name));
assert(static_cast<unsigned>(impl->MKernelNumArgs) == Info.NumParams);
assert(impl->MKernelParamDescGetter == Info.ParamDescGetter ||
impl->MKernelParamDescGetter == nullptr);
assert(impl->MKernelIsESIMD == Info.IsESIMD);
assert(impl->MKernelHasSpecialCaptures == Info.HasSpecialCaptures);

// If there were uses of set_specialization_constant build the kernel_bundle
detail::kernel_bundle_impl *KernelBundleImpPtr =
getOrInsertHandlerKernelBundlePtr(/*Insert=*/false);
Expand Down