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.

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

Bump GPUCompiler #255

Merged
merged 2 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.8.5"
manifest_format = "2.0"
project_hash = "3c71723ae8de626fd078be79d06f06f4692acdda"
project_hash = "67c95e48b92cf80bdb2cbfc8401d817b3fca0d67"

[[deps.Adapt]]
deps = ["LinearAlgebra", "Requires"]
Expand Down Expand Up @@ -79,9 +79,9 @@ version = "0.1.5"

[[deps.GPUCompiler]]
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"]
git-tree-sha1 = "8573c39f9c4e99720ab5ea44104efb3ed07a58b0"
git-tree-sha1 = "e5e0f07db5c325860b21cadeb6e4271b0ff364c5"
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
version = "0.23.0"
version = "0.24.1"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
Expand Down Expand Up @@ -204,9 +204,9 @@ version = "0.3.20+0"

[[deps.OpenSSL_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "bbb5c2115d63c2f1451cb70e5ef75e8fe4707019"
git-tree-sha1 = "a12e56c72edee3ce6b96667745e6cbbe5498f200"
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
version = "1.1.22+0"
version = "1.1.23+0"

[[deps.Pkg]]
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Adapt = "3"
CEnum = "0.4"
ExprTools = "0.1"
GPUArrays = "9"
GPUCompiler = "0.23"
GPUCompiler = "0.23, 0.24"
KernelAbstractions = "0.9.1"
LLVM = "6"
Metal_LLVM_Tools_jll = "~0.5"
Expand Down
4 changes: 2 additions & 2 deletions test/execution.jl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ end
# make sure invalid kernels can be partially reflected upon
let
invalid_kernel() = throw()
@test_throws Metal.KernelError @metal invalid_kernel()
@test_throws Metal.KernelError @grab_output @device_code_warntype @metal invalid_kernel()
@test_throws Metal.InvalidIRError @metal invalid_kernel()
@test_throws Metal.InvalidIRError @grab_output @device_code_warntype @metal invalid_kernel()
out, err = @grab_output begin
try
@device_code_warntype @metal invalid_kernel()
Expand Down
12 changes: 0 additions & 12 deletions test/setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,4 @@ macro on_device(ex...)
end)
end

# helper function for sinking a value to prevent the callee from getting optimized away
@inline sink(i::Int32) =
Base.llvmcall("""%slot = alloca i32
store volatile i32 %0, i32* %slot
%value = load volatile i32, i32* %slot
ret i32 %value""", Int32, Tuple{Int32}, i)
@inline sink(i::Int64) =
Base.llvmcall("""%slot = alloca i64
store volatile i64 %0, i64* %slot
%value = load volatile i64, i64* %slot
ret i64 %value""", Int64, Tuple{Int64}, i)

nothing # File is loaded via a remotecall to "include". Ensure it returns "nothing".