Skip to content

Turn on SPIR-V builtin generation for OpenCL CPP sources #2466

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
asudarsa merged 5 commits into from
Apr 2, 2024
Merged

Turn on SPIR-V builtin generation for OpenCL CPP sources #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a9d600
Turn on SPIR-V builtin generation for OpenCL CPP sources
asudarsa Mar 28, 2024
82285ac
Added the missing step to generate spv file
asudarsa Mar 28, 2024
9900e9c
Added CPP_for_OpenCL as well
asudarsa Mar 28, 2024
5c74ba9
Add test changes
asudarsa Mar 28, 2024
3962949
Modify comments
asudarsa Apr 1, 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
8 changes: 5 additions & 3 deletions lib/SPIRV/OCLToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,11 @@ bool OCLToSPIRVBase::runOCLToSPIRV(Module &Module) {
auto Src = getSPIRVSource(&Module);
// This is a pre-processing pass, which transform LLVM IR module to a more
// suitable form for the SPIR-V translation: it is specifically designed to
// handle OpenCL C built-in functions and shouldn't be launched for other
// source languages
if (std::get<0>(Src) != spv::SourceLanguageOpenCL_C)
// handle OpenCL C/C++ and C++ for OpenCL modules and shouldn't be launched
// for other source languages.
if (std::get<0>(Src) != spv::SourceLanguageOpenCL_C &&
std::get<0>(Src) != spv::SourceLanguageOpenCL_CPP &&
std::get<0>(Src) != spv::SourceLanguageCPP_for_OpenCL)
return false;

CLVer = std::get<1>(Src);
Expand Down
8 changes: 7 additions & 1 deletion lib/SPIRV/OCLTypeToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,13 @@ bool OCLTypeToSPIRVBase::runOCLTypeToSPIRV(Module &Module) {
AdaptedTy.clear();
WorkSet.clear();
auto Src = getSPIRVSource(&Module);
if (std::get<0>(Src) != spv::SourceLanguageOpenCL_C)
// This is a pre-processing pass, which transform LLVM IR module to a more
// suitable form for the SPIR-V translation: it is specifically designed to
// handle OpenCL C/C++ and C++ for OpenCL types and shouldn't be launched for
// other source languages.
if (std::get<0>(Src) != spv::SourceLanguageOpenCL_C &&
std::get<0>(Src) != spv::SourceLanguageOpenCL_CPP &&
std::get<0>(Src) != spv::SourceLanguageCPP_for_OpenCL)
return false;

for (auto &F : Module.functions())
Expand Down
2 changes: 1 addition & 1 deletion ...TEL_arbitrary_precision_fixed_point/capability-arbitrary-precision-fixed-point-numbers.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ attributes #5 = { nounwind }

!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 1, i32 2}
!2 = !{i32 4, i32 100000}
!2 = !{i32 7, i32 100000}
Copy link
Contributor Author

@asudarsa asudarsa Mar 28, 2024

Choose a reason for hiding this comment

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

This test case was actually derived from SYCL source.

!3 = !{!"clang version 11.0.0"}
!4 = !{}
!5 = !{!6, !6, i64 0}
Expand Down
27 changes: 27 additions & 0 deletions test/ocl_to_spirv_for_cpp_for_opencl.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
;; This test checks if builtins in LLVM IR generated from CPP_for_OpenCL sources
;; are correctly translated to SPIR-V builtin variables.

; RUN: llvm-as %s -o %t.bc
; RUN: llvm-spirv %t.bc -o %t.spv
; RUN: llvm-spirv %t.bc -spirv-text -o %t.txt
; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
; RUN: spirv-val %t.spv

target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
target triple = "spir-unknown-unknown"

%opencl.event_t = type opaque

; CHECK-SPIRV: {{[0-9]+}} Name {{[0-9]+}} "__spirv_BuiltInWorkgroupId"
; Function Attrs: nounwind
define spir_kernel void @test_fn(i32 %a) {
entry:
%call15 = call spir_func i32 @_Z12get_group_idj(i32 0)
ret void
}

declare spir_func i32 @_Z12get_group_idj(i32)

!spirv.Source = !{!0}

!0 = !{i32 6, i32 100000}
27 changes: 27 additions & 0 deletions test/ocl_to_spirv_for_opencl_cpp.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
;; This test checks if builtins in LLVM IR generated from OpenCL_CPP sources
;; are correctly translated to SPIR-V builtin variables.

; RUN: llvm-as %s -o %t.bc
Copy link
Contributor

@LU-JOHN LU-JOHN Mar 28, 2024

Choose a reason for hiding this comment

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

Consider adding a comment describing purpose of this test. I think that looking at the filename or file history is not as clear or convenient.

Copy link
Contributor Author

@asudarsa asudarsa Mar 28, 2024

Choose a reason for hiding this comment

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

Done. Thanks

; RUN: llvm-spirv %t.bc -o %t.spv
; RUN: llvm-spirv %t.bc -spirv-text -o %t.txt
; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
; RUN: spirv-val %t.spv

target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
target triple = "spir-unknown-unknown"

%opencl.event_t = type opaque

; CHECK-SPIRV: {{[0-9]+}} Name {{[0-9]+}} "__spirv_BuiltInWorkgroupId"
; Function Attrs: nounwind
define spir_kernel void @test_fn(i32 %a) {
entry:
%call15 = call spir_func i32 @_Z12get_group_idj(i32 0)
ret void
}

declare spir_func i32 @_Z12get_group_idj(i32)

!spirv.Source = !{!0}

!0 = !{i32 4, i32 100000}