Skip to content
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

Jump to bottom

Bump the compiler toolchain. #388

Merged
merged 6 commits into from
Feb 27, 2024
Merged

Bump the compiler toolchain. #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dbe511
Bump the compiler toolchain.
maleadt Feb 23, 2024
f0f6779
Disable problematic test.
maleadt Feb 26, 2024
c402b04
Perform validation tests on 1.10.
maleadt Feb 26, 2024
11e4682
Mention libigc_jll in extras for preferences.
maleadt Feb 26, 2024
737330a
Fix GPUCompiler interface implementation.
maleadt Feb 26, 2024
7ca684a
Fix version number.
maleadt Feb 27, 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 .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ steps:
- label: "Validation"
plugins:
- JuliaCI/julia#v1:
version: 1.8
version: "1.10"
- JuliaCI/julia-test#v1:
julia_args: "-g2"
- JuliaCI/julia-coverage#v1:
Expand Down
23 changes: 13 additions & 10 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,36 @@ ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
NEO_jll = "700fe977-ac61-5f37-bbc8-c6c4b2b6a9fd"
oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
oneAPI_Level_Zero_Loader_jll = "13eca655-d68d-5b81-8367-6d99d727ab01"
oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
SPIRV_LLVM_Translator_unified_jll = "85f0d8ed-5b39-5caa-b1ae-7472de402361"
SPIRV_Tools_jll = "6ac6d60f-d740-5983-97d7-a4482c0689f4"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
oneAPI_Level_Zero_Loader_jll = "13eca655-d68d-5b81-8367-6d99d727ab01"
oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"

[compat]
Adapt = "4"
CEnum = "0.4, 0.5"
ExprTools = "0.1"
GPUArrays = "10"
GPUCompiler = "0.23, 0.24, 0.25, 0.26"
julia = "1.8"
KernelAbstractions = "0.9.1"
LLVM = "6"
NEO_jll = "=23.17.26241"
NEO_jll = "=24.05.28454"
oneAPI_Level_Zero_Loader_jll = "1.9"
oneAPI_Support_jll = "~0.3.0"
Preferences = "1"
SPIRV_LLVM_Translator_unified_jll = "0.3"
SpecialFunctions = "1.3, 2"
SPIRV_LLVM_Translator_unified_jll = "0.3"
StaticArrays = "1"
julia = "1.8"
oneAPI_Level_Zero_Loader_jll = "1.9"
oneAPI_Support_jll = "~0.3.0"

[extras]
libigc_jll = "94295238-5935-5bd7-bb0f-b00942e9bdd5"
11 changes: 7 additions & 4 deletions src/compiler/compilation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ GPUCompiler.isintrinsic(job::oneAPICompilerJob, fn::String) =
job, fn) ||
in(fn, opencl_builtins)

function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module)
invoke(GPUCompiler.finish_module!,
Tuple{CompilerJob{SPIRVCompilerTarget}, typeof(mod)},
job, mod)
function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module,
entry::LLVM.Function)
entry = invoke(GPUCompiler.finish_module!,
Tuple{CompilerJob{SPIRVCompilerTarget}, typeof(mod), typeof(entry)},
job, mod, entry)

# OpenCL 2.0
push!(metadata(mod)["opencl.ocl.version"],
Expand All @@ -33,6 +34,8 @@ function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module)
push!(metadata(mod)["opencl.spirv.version"],
MDNode([ConstantInt(Int32(1)),
ConstantInt(Int32(5))]))

return entry
end


Expand Down
5 changes: 3 additions & 2 deletions test/device/intrinsics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ end
endline = Sys.iswindows() ? "\r\n" : "\n"

@testset "formatted output" begin
_, out = @grab_output @on_device oneAPI.@printf("")
@test out == ""
# BROKEN: cintel/compute-runtime#635
#_, out = @grab_output @on_device oneAPI.@printf("")
#@test out == ""

_, out = @grab_output @on_device oneAPI.@printf("Testing...\n")
@test out == "Testing...$endline"
Expand Down