Merge pull request #304 from JuliaGPU/tb/asserts

Bump LLVM and SPIRV_LLVM_Translator for asserts compat.

Author: maleadt

Manifest.toml

@@ -39,15 +39,19 @@ version = "1.4.1"
 
 [[LLVM]]
 deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
-git-tree-sha1 = "761c362ede582d358026e22d08695231dd25242e"
+git-tree-sha1 = "302e6cfb8d83ba7a9658d7d51725620fa9db8702"
 uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
-version = "4.8.0"
+version = "4.9.0"
 
 [[LLVMExtra_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "67cc5406b15bd04ff72a45f628bec61d36078908"
+deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"]
+git-tree-sha1 = "5558ad3c8972d602451efe9d81c78ec14ef4f5ef"
 uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
-version = "0.0.13+3"
+version = "0.0.14+2"
+
+[[LazyArtifacts]]
+deps = ["Artifacts", "Pkg"]
+uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]

src/spirv.jl

@@ -4,7 +4,7 @@
 # https://github.com/KhronosGroup/LLVM-SPIRV-Backend/blob/master/llvm/docs/SPIR-V-Backend.rst
 # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/master/docs/SPIRVRepresentationInLLVM.rst
 
-const SPIRV_LLVM_Translator_jll = LazyModule("SPIRV_LLVM_Translator_jll", UUID("4a5d46fc-d8cf-5151-a261-86b458210efb"))
+const SPIRV_LLVM_Translator_unified_jll = LazyModule("SPIRV_LLVM_Translator_unified_jll", UUID("85f0d8ed-5b39-5caa-b1ae-7472de402361"))
 const SPIRV_Tools_jll = LazyModule("SPIRV_Tools_jll", UUID("6ac6d60f-d740-5983-97d7-a4482c0689f4"))
 
 
@@ -94,7 +94,7 @@ end
     input = tempname(cleanup=false) * ".bc"
     translated = tempname(cleanup=false) * ".spv"
     write(input, mod)
-    SPIRV_LLVM_Translator_jll.llvm_spirv() do translator
+    SPIRV_LLVM_Translator_unified_jll.llvm_spirv() do translator
         proc = run(ignorestatus(`$translator --spirv-debug-info-version=ocl-100 -o $translated $input`))
         if !success(proc)
             error("""Failed to translate LLVM code to SPIR-V.

test/Project.toml

@@ -1,6 +1,6 @@
 [deps]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
-SPIRV_LLVM_Translator_jll = "4a5d46fc-d8cf-5151-a261-86b458210efb"
+SPIRV_LLVM_Translator_unified_jll = "85f0d8ed-5b39-5caa-b1ae-7472de402361"
 SPIRV_Tools_jll = "6ac6d60f-d740-5983-97d7-a4482c0689f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/spirv.jl

@@ -1,4 +1,4 @@
-using SPIRV_LLVM_Translator_jll, SPIRV_Tools_jll
+using SPIRV_LLVM_Translator_unified_jll, SPIRV_Tools_jll
 
 @testset "SPIR-V" begin