Skip to content

Commit bb223ad

Browse files
authored
Bump the compiler toolchain. (#388)
1 parent 249125b commit bb223ad

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

.buildkite/pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
- label: "Validation"
4141
plugins:
4242
- JuliaCI/julia#v1:
43-
version: 1.8
43+
version: "1.10"
4444
- JuliaCI/julia-test#v1:
4545
julia_args: "-g2"
4646
- JuliaCI/julia-coverage#v1:

Project.toml

+13-10
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,36 @@ ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
1010
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
1111
GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
1212
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
13-
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
1413
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
14+
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
1515
NEO_jll = "700fe977-ac61-5f37-bbc8-c6c4b2b6a9fd"
16+
oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
17+
oneAPI_Level_Zero_Loader_jll = "13eca655-d68d-5b81-8367-6d99d727ab01"
18+
oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"
1619
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
1720
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1821
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
22+
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
1923
SPIRV_LLVM_Translator_unified_jll = "85f0d8ed-5b39-5caa-b1ae-7472de402361"
2024
SPIRV_Tools_jll = "6ac6d60f-d740-5983-97d7-a4482c0689f4"
21-
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2225
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
23-
oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
24-
oneAPI_Level_Zero_Loader_jll = "13eca655-d68d-5b81-8367-6d99d727ab01"
25-
oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"
2626

2727
[compat]
2828
Adapt = "4"
2929
CEnum = "0.4, 0.5"
3030
ExprTools = "0.1"
3131
GPUArrays = "10"
3232
GPUCompiler = "0.23, 0.24, 0.25, 0.26"
33+
julia = "1.8"
3334
KernelAbstractions = "0.9.1"
3435
LLVM = "6"
35-
NEO_jll = "=23.17.26241"
36+
NEO_jll = "=24.05.28454"
37+
oneAPI_Level_Zero_Loader_jll = "1.9"
38+
oneAPI_Support_jll = "~0.3.0"
3639
Preferences = "1"
37-
SPIRV_LLVM_Translator_unified_jll = "0.3"
3840
SpecialFunctions = "1.3, 2"
41+
SPIRV_LLVM_Translator_unified_jll = "0.3"
3942
StaticArrays = "1"
40-
julia = "1.8"
41-
oneAPI_Level_Zero_Loader_jll = "1.9"
42-
oneAPI_Support_jll = "~0.3.0"
43+
44+
[extras]
45+
libigc_jll = "94295238-5935-5bd7-bb0f-b00942e9bdd5"

src/compiler/compilation.jl

+7-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ GPUCompiler.isintrinsic(job::oneAPICompilerJob, fn::String) =
1919
job, fn) ||
2020
in(fn, opencl_builtins)
2121

22-
function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module)
23-
invoke(GPUCompiler.finish_module!,
24-
Tuple{CompilerJob{SPIRVCompilerTarget}, typeof(mod)},
25-
job, mod)
22+
function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module,
23+
entry::LLVM.Function)
24+
entry = invoke(GPUCompiler.finish_module!,
25+
Tuple{CompilerJob{SPIRVCompilerTarget}, typeof(mod), typeof(entry)},
26+
job, mod, entry)
2627

2728
# OpenCL 2.0
2829
push!(metadata(mod)["opencl.ocl.version"],
@@ -33,6 +34,8 @@ function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module)
3334
push!(metadata(mod)["opencl.spirv.version"],
3435
MDNode([ConstantInt(Int32(1)),
3536
ConstantInt(Int32(5))]))
37+
38+
return entry
3639
end
3740

3841

test/device/intrinsics.jl

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ end
4545
endline = Sys.iswindows() ? "\r\n" : "\n"
4646

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

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

0 commit comments

Comments
 (0)