Skip to content

Conversation

@AlexeySachkov
Copy link
Contributor

This patch resolves #19409

Two main changes were done:

  1. Corrected method of detection that kernel is defined as an inline function. The original code detecting this was introduced in [SYCL] Allow an inlined kernel to be called from multiple TUs. #338, but by some reason we looked into a headers-provided wrapper that calls a kernel instead of a kernel itself. Alongside with fixing this, a dedicated clang-level test was added to check this behavior

  2. Fixed a bug introduced by incorrect conflict resolution (commit fcd95a9) with [clang] Simplify device kernel attributes  llvm/llvm-project#137882. Specifically, when deciding if a function (that is expected to be a SYCL kernel) linkage should be promoted to non-discardable we used to check for OpenCL kernel attribute. That attribute is not present in SYCL headers and therefore was only generated for actual SYCL kernels emitted by front-end. However, with kernel attributes unified, we now promote linkage of non-kernel wrapper function that has sycl_kernel attribute attached to it explicitly by SYCL headers. The fix here is to only react to the kernel attribute if it was added implicitly, to preserve original behavior.

This patch resolves intel#19409

Two main changes were done:

1. Corrected method of detection that kernel is defined as an inline
   function. The original code detecting this was introduced in intel#338,
   but by some reason we looked into a headers-provided wrapper that
   calls a kernel instead of a kernel itself. Alongside with fixing
   this, a dedicated clang-level test was added to check this behavior

2. Fixed a bug introduced by incorrect conflict resolution (commit
   fcd95a9) with llvm/llvm-project#137882.
   Specifically, when deciding if a function (that is expected to be a SYCL
   kernel) linkage should be promoted to non-discardable we used to check for
   OpenCL kernel attribute. That attribute is not present in SYCL headers and
   therefore was only generated for actual SYCL kernels emitted by front-end.
   However, with kernel attributes unified, we now promote linkage of
   non-kernel wrapper function that has `sycl_kernel` attribute attached
   to it explicitly by SYCL headers. The fix here is to only react to
   the kernel attribute if it was added implicitly, to preserve
   original behavior.
Copy link
Contributor

@Fznamznon Fznamznon left a comment

Choose a reason for hiding this comment

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

A couple of NITs, otherwise LGTM. What I don't really get is how that worked before. IMO linkage of sycl_kernel attributed function should not really matter.

@AlexeySachkov
Copy link
Contributor Author

What I don't really get is how that worked before. IMO linkage of sycl_kernel attributed function should not really matter.

KernelCallerFunc happened to have been inline in our SYCL headers for the entirety of the repo history. If you go from external to weak_odr, you don't really have issues, so it worked. If we had made any changes to headers then the original patch wouldn't have worked at all.

Copy link
Contributor

@sarnex sarnex left a comment

Choose a reason for hiding this comment

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

ESIMD + FE LGTM but will leave actual FE review to Mariya :)

return GVA_StrongExternal;
} else if (Context.getLangOpts().SYCLIsDevice &&
D->hasAttr<DeviceKernelAttr>()) {
(D->hasAttr<DeviceKernelAttr>() &&
Copy link
Contributor

Choose a reason for hiding this comment

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

Lol sorry about all the problems caused from unifying the attributes, I originally just wanted to add a new attribute for SPIR kernels but upstream suggested I unify them all, thanks for fixing this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To be fair, this whole thing with fixing-up the linkage is also a little bit weird, so no worries :)

@sarnex sarnex requested a review from a team August 12, 2025 14:23
Copy link
Contributor

@YuriPlyakhin YuriPlyakhin left a comment

Choose a reason for hiding this comment

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

Joint Matrix changes LGTM

@AlexeySachkov AlexeySachkov merged commit caee1ca into intel:sycl Aug 14, 2025
44 of 45 checks passed
@AlexeySachkov AlexeySachkov deleted the private/asachkov/fix-kernel-linkage-adjustment branch August 14, 2025 04:47
AlexeySachkov added a commit to AlexeySachkov/llvm that referenced this pull request Aug 28, 2025
This patch resolves intel#19409

Two main changes were done:

1. Corrected method of detection that kernel is defined as an inline
function. The original code detecting this was introduced in intel#338, but
by some reason we looked into a headers-provided wrapper that calls a
kernel instead of a kernel itself. Alongside with fixing this, a
dedicated clang-level test was added to check this behavior

2. Fixed a bug introduced by incorrect conflict resolution (commit
fcd95a9) with llvm/llvm-project#137882.
Specifically, when deciding if a function (that is expected to be a SYCL
kernel) linkage should be promoted to non-discardable we used to check
for OpenCL kernel attribute. That attribute is not present in SYCL
headers and therefore was only generated for actual SYCL kernels emitted
by front-end. However, with kernel attributes unified, we now promote
linkage of non-kernel wrapper function that has `sycl_kernel` attribute
attached to it explicitly by SYCL headers. The fix here is to only react
to the kernel attribute if it was added implicitly, to preserve original
behavior.
AlexeySachkov added a commit that referenced this pull request Aug 29, 2025
This is a cherry-pick of #19771

This patch resolves #19409

Two main changes were done:

1. Corrected method of detection that kernel is defined as an inline
function. The original code detecting this was introduced in #338, but
by some reason we looked into a headers-provided wrapper that calls a
kernel instead of a kernel itself. Alongside with fixing this, a
dedicated clang-level test was added to check this behavior

2. Fixed a bug introduced by incorrect conflict resolution (commit
fcd95a9) with llvm/llvm-project#137882.
Specifically, when deciding if a function (that is expected to be a SYCL
kernel) linkage should be promoted to non-discardable we used to check
for OpenCL kernel attribute. That attribute is not present in SYCL
headers and therefore was only generated for actual SYCL kernels emitted
by front-end. However, with kernel attributes unified, we now promote
linkage of non-kernel wrapper function that has `sycl_kernel` attribute
attached to it explicitly by SYCL headers. The fix here is to only react
to the kernel attribute if it was added implicitly, to preserve original
behavior.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

sycl/test/extensions/properties/properties_kernel_device_has_warning.cpp is failing

6 participants