Skip to content

Conversation

@AlexeySachkov
Copy link
Contributor

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 [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.
@AlexeySachkov
Copy link
Contributor Author

Unexpectedly Passed Tests (1):
  SYCL :: KernelAndProgram/kernel-bundle-get-kernel-ids.cpp

The same XPASS for both CUDA & HIP. Siimlar behavior was observed on the sycl branch, but in Nightly: #19615

I will proceed with the merge and follow-up on that test separately

@AlexeySachkov AlexeySachkov merged commit 40e247d into intel:sycl-rel-6_3 Aug 29, 2025
21 of 23 checks passed
@AlexeySachkov AlexeySachkov deleted the private/asachkov/cherry-pick-19771 branch August 29, 2025 09:13
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.

2 participants