Skip to content

[SYCL][NFCI] Handler class ABI cleanup [1/N] #20151

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 4 commits into from
Sep 23, 2025
Merged

[SYCL][NFCI] Handler class ABI cleanup [1/N] #20151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0f5bf3
[SYCL][NFCI] Handler class ABI cleanup [1/N]
AlexeySachkov Sep 22, 2025
f3be8a3
Reduce the diff
AlexeySachkov Sep 22, 2025
50dba03
Fix tests and deprecate public method
AlexeySachkov Sep 22, 2025
57f2212
Fix deprecation macro placement and a few more tests
AlexeySachkov Sep 23, 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
7 changes: 7 additions & 0 deletions sycl/include/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ class __SYCL_EXPORT handler {
bool IsKernelCreatedFromSource, bool IsESIMD);
#endif

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
/// \return a string containing name of SYCL kernel.
detail::ABINeutralKernelNameStrT getKernelName();

Expand All @@ -543,6 +544,7 @@ class __SYCL_EXPORT handler {
detail::ABINeutralKernelNameStrT KernelName = getKernelName();
return KernelName == LambdaName;
}
#endif

/// Saves the location of user's code passed in \p CodeLoc for future usage in
/// finalize() method.
Expand Down Expand Up @@ -1897,6 +1899,10 @@ class __SYCL_EXPORT handler {
Kernel);
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// Implementation for something that had to be removed long ago but now stuck
// until next major release...

/// Defines and invokes a SYCL kernel function.
///
/// \param Kernel is a SYCL kernel that is executed on a SYCL device
Expand Down Expand Up @@ -1931,6 +1937,7 @@ class __SYCL_EXPORT handler {
detail::CheckDeviceCopyable<KernelType>();
#endif
}
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
/// Defines and invokes a SYCL kernel function for the specified range.
Expand Down
8 changes: 5 additions & 3 deletions sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ void handler::extractArgsAndReqs() {
if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) {
impl->MKernelData.setDeviceKernelInfoPtr(
&detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
toKernelNameStrT(getKernelName())));
std::string(MKernel->getName())));
Copy link
Contributor

Choose a reason for hiding this comment

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

toKernelNameStrT implementation is under preview, I'd prefer not touching its uses and leave the actual "simplification"/inlining of *KernelNameStr*T types to after all the non-preview uses are completely removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

toKernelNameStrT implementation is under preview,

It can't be under preview because the code I'm changing is not under preview. I made the change because local build failed, but I've just realized that detail:: is missing

}
#endif
assert(impl->MKernelData.getDeviceKernelInfoPtr() != nullptr);
Expand All @@ -1109,7 +1109,7 @@ void handler::extractArgsAndReqsFromLambda(
if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) {
impl->MKernelData.setDeviceKernelInfoPtr(
&detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
toKernelNameStrT(getKernelName())));
std::string(MKernel->getName())));
}
impl->MKernelData.setKernelInfo(LambdaPtr, NumKernelParams, ParamDescGetter,
IsESIMD, true);
Expand Down Expand Up @@ -1158,12 +1158,14 @@ void handler::extractArgsAndReqsFromLambda(
}
#endif // __INTEL_PREVIEW_BREAKING_CHANGES

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// Calling methods of kernel_impl requires knowledge of class layout.
// As this is impossible in header, there's a function that calls necessary
// method inside the library and returns the result.
detail::ABINeutralKernelNameStrT handler::getKernelName() {
return MKernel->getName();
}
#endif

void handler::verifyUsedKernelBundleInternal(detail::string_view KernelName) {
detail::kernel_bundle_impl *UsedKernelBundleImplPtr =
Expand Down Expand Up @@ -2239,7 +2241,7 @@ sycl::detail::CGType handler::getType() const { return impl->MCGType; }

void handler::setDeviceKernelInfo(kernel &&Kernel) {
MKernel = detail::getSyclObjImpl(std::move(Kernel));
MKernelName = getKernelName();
MKernelName = MKernel->getName();
setDeviceKernelInfoPtr(&MKernel->getDeviceKernelInfo());
setType(detail::CGType::Kernel);

Expand Down
Loading