Skip to content

[SYCL] Fix device lib req mask for spirv target #15336

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 12, 2024
Merged

[SYCL] Fix device lib req mask for spirv target #15336

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
735a064
[SYCL] Fix device lib req mask for spirv target
sarnex Sep 9, 2024
fa66d91
Merge remote-tracking branch 'upstream/sycl' into sycl
sarnex Sep 10, 2024
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
2 changes: 1 addition & 1 deletion llvm/lib/SYCLLowerIR/SYCLDeviceLibReqMask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ uint32_t getDeviceLibBits(const std::string &FuncName) {
// And we don't expect non-spirv functions with "__devicelib_" prefix.
uint32_t llvm::getSYCLDeviceLibReqMask(const Module &M) {
// Device libraries will be enabled only for spir-v module.
if (!Triple(M.getTargetTriple()).isSPIR())
if (!Triple(M.getTargetTriple()).isSPIROrSPIRV())
return 0;
uint32_t ReqMask = 0;
for (const Function &SF : M) {
Expand Down
20 changes: 20 additions & 0 deletions llvm/test/tools/sycl-post-link/device-requirements/mask.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
; RUN: sycl-post-link -properties -split=auto < %s -o %t.files.table
; RUN: FileCheck %s -input-file=%t.files_0.prop

; CHECK:[SYCL/devicelib req mask]
; CHECK: DeviceLibReqMask=1|64

source_filename = "main.cpp"
target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
target triple = "spirv64-unknown-unknown"

declare spir_func i32 @__devicelib_imf_umulhi(i32 noundef %0, i32 noundef %1)

; Function Attrs: convergent mustprogress noinline norecurse optnone
define weak_odr dso_local spir_kernel void @kernel() #0 {
entry:
%0 = call i32 @__devicelib_imf_umulhi(i32 0, i32 0)
ret void
}

attributes #0 = { "sycl-module-id"="main.cpp" }