Merge branch 'master' into dk/triangular

Author: dkarrasch

Manifest.toml

@@ -33,16 +33,16 @@ uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 version = "1.16.0"
 
 [[ChangesOfVariables]]
-deps = ["LinearAlgebra", "Test"]
-git-tree-sha1 = "f84967c4497e0e1955f9a582c232b02847c5f589"
+deps = ["InverseFunctions", "LinearAlgebra", "Test"]
+git-tree-sha1 = "2fba81a302a7be671aefe194f0525ef231104e7f"
 uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
-version = "0.1.7"
+version = "0.1.8"
 
 [[Compat]]
 deps = ["Dates", "LinearAlgebra", "UUIDs"]
-git-tree-sha1 = "7a60c856b9fa189eb34f5f8a6f6b5529b7942957"
+git-tree-sha1 = "4e88377ae7ebeaf29a047aa1ee40826e0b708a5d"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.6.1"
+version = "4.7.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -69,9 +69,9 @@ version = "0.1.9"
 
 [[GPUArrays]]
 deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"]
-git-tree-sha1 = "a3351bc577a6b49297248aadc23a4add1097c2ac"
+git-tree-sha1 = "2e57b4a4f9cc15e85a24d603256fe08e527f48d1"
 uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
-version = "8.7.1"
+version = "8.8.1"
 
 [[GPUArraysCore]]
 deps = ["Adapt"]
@@ -81,19 +81,19 @@ version = "0.1.5"
 
 [[GPUCompiler]]
 deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"]
-git-tree-sha1 = "cb090aea21c6ca78d59672a7e7d13bd56d09de64"
+git-tree-sha1 = "72b2e3c2ba583d1a7aa35129e56cf92e07c083e3"
 uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
-version = "0.20.3"
+version = "0.21.4"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[InverseFunctions]]
 deps = ["Test"]
-git-tree-sha1 = "6667aadd1cdee2c6cd068128b3d226ebc4fb0c67"
+git-tree-sha1 = "eabe3125edba5c9c10b60a160b1779a000dc8b29"
 uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
-version = "0.1.9"
+version = "0.1.11"
 
 [[IrrationalConstants]]
 git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
@@ -107,22 +107,22 @@ uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 version = "1.4.1"
 
 [[KernelAbstractions]]
-deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"]
-git-tree-sha1 = "47be64f040a7ece575c2b5f53ca6da7b548d69f4"
+deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"]
+git-tree-sha1 = "6d08ca80b621635fed9cdfeb9a4280a574020bf3"
 uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
-version = "0.9.4"
+version = "0.9.7"
 
 [[LLVM]]
 deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
-git-tree-sha1 = "26a31cdd9f1f4ea74f649a7bf249703c687a953d"
+git-tree-sha1 = "8695a49bfe05a2dc0feeefd06b4ca6361a018729"
 uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
-version = "5.1.0"
+version = "6.1.0"
 
 [[LLVMExtra_jll]]
 deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
-git-tree-sha1 = "09b7505cc0b1cee87e5d4a26eea61d2e1b0dcd35"
+git-tree-sha1 = "c35203c1e1002747da220ffc3c0762ce7754b08c"
 uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
-version = "0.0.21+0"
+version = "0.0.23+0"
 
 [[LazyArtifacts]]
 deps = ["Artifacts", "Pkg"]
@@ -178,10 +178,10 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NEO_jll]]
-deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg", "TOML", "gmmlib_jll", "libigc_jll", "oneAPI_Level_Zero_Headers_jll"]
-git-tree-sha1 = "4d9647b216d16c41be59eafc0b2e2d2c4e7619f4"
+deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML", "gmmlib_jll", "libigc_jll", "oneAPI_Level_Zero_Headers_jll"]
+git-tree-sha1 = "9846d87fd254cdaa1879dff93999e1bc32ed2658"
 uuid = "700fe977-ac61-5f37-bbc8-c6c4b2b6a9fd"
-version = "22.53.25593+1"
+version = "23.17.26241+0"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -268,20 +268,20 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[SpecialFunctions]]
 deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
-git-tree-sha1 = "ef28127915f4229c971eb43f3fc075dd3fe91880"
+git-tree-sha1 = "7beb031cf8145577fbccacd94b8a8f4ce78428d3"
 uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
-version = "2.2.0"
+version = "2.3.0"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"]
-git-tree-sha1 = "8982b3607a212b070a5e46eea83eb62b4744ae12"
+git-tree-sha1 = "fffc14c695c17bfdbfa92a2a01836cdc542a1e46"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.5.25"
+version = "1.6.1"
 
 [[StaticArraysCore]]
-git-tree-sha1 = "6b7ba252635a5eff6a0b0664a41ee140a1c9e72a"
+git-tree-sha1 = "1d5708d926c76a505052d0d24a846d5da08bc3a4"
 uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
-version = "1.4.0"
+version = "1.4.1"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -319,9 +319,9 @@ version = "0.2.1"
 
 [[UnsafeAtomicsLLVM]]
 deps = ["LLVM", "UnsafeAtomics"]
-git-tree-sha1 = "ea37e6066bf194ab78f4e747f5245261f17a7175"
+git-tree-sha1 = "323e3d0acf5e78a56dfae7bd8928c989b4f3083e"
 uuid = "d80eeb9a-aca5-4d75-85e5-170c8b632249"
-version = "0.1.2"
+version = "0.1.3"
 
 [[Zlib_jll]]
 deps = ["Libdl"]
@@ -334,26 +334,26 @@ uuid = "09858cae-167c-5acb-9302-fddc6874d481"
 version = "22.3.0+0"
 
 [[libigc_jll]]
-deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg", "TOML"]
-git-tree-sha1 = "a4b9585cbd75441b0d28d0e3391e625662dd9591"
+deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
+git-tree-sha1 = "7c0b5fa2ff90d96af106fd4a67ff6923cd3f9cb9"
 uuid = "94295238-5935-5bd7-bb0f-b00942e9bdd5"
-version = "1.0.13230+2"
+version = "1.0.13822+0"
 
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
 
 [[oneAPI_Level_Zero_Headers_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "f46de664cb4e560f045cd3d30ad2d811ab1acb2d"
+git-tree-sha1 = "412efcf5d55c65d3352c3915cffec1e53955570f"
 uuid = "f4bc562b-d309-54f8-9efb-476e56f0410d"
-version = "1.5.8+0"
+version = "1.6.3+0"
 
 [[oneAPI_Level_Zero_Loader_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "oneAPI_Level_Zero_Headers_jll"]
-git-tree-sha1 = "8eb79e3c6cd5c1211a18f712677aa93a45de8ff5"
+git-tree-sha1 = "87980483b19f0a00c8d62e8b6682acac1894c638"
 uuid = "13eca655-d68d-5b81-8367-6d99d727ab01"
-version = "1.9.4+0"
+version = "1.11.0+0"
 
 [[oneAPI_Support_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "oneAPI_Level_Zero_Loader_jll"]

Project.toml

@@ -1,7 +1,7 @@
 name = "oneAPI"
 uuid = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"
 authors = ["Tim Besard <[email protected]>"]
-version = "1.2.5"
+version = "1.3.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -29,10 +29,10 @@ Adapt = "2.0, 3.0"
 CEnum = "0.4"
 ExprTools = "0.1"
 GPUArrays = "8.4"
-GPUCompiler = "0.20.1"
+GPUCompiler = "0.20.1, 0.21"
 KernelAbstractions = "0.9.1"
-LLVM = "5.0"
-NEO_jll = "=22.53.25593"
+LLVM = "6"
+NEO_jll = "=23.17.26241"
 Preferences = "1"
 SPIRV_LLVM_Translator_unified_jll = "0.3"
 SpecialFunctions = "1.3, 2"

src/compiler/compilation.jl

@@ -23,17 +23,16 @@ function GPUCompiler.finish_module!(job::oneAPICompilerJob, mod::LLVM.Module)
     invoke(GPUCompiler.finish_module!,
            Tuple{CompilerJob{SPIRVCompilerTarget}, typeof(mod)},
            job, mod)
-    ctx = LLVM.context(mod)
 
     # OpenCL 2.0
     push!(metadata(mod)["opencl.ocl.version"],
-          MDNode([ConstantInt(Int32(2); ctx),
-                  ConstantInt(Int32(0); ctx)]; ctx))
+          MDNode([ConstantInt(Int32(2)),
+                  ConstantInt(Int32(0))]))
 
     # SPIR-V 1.5
     push!(metadata(mod)["opencl.spirv.version"],
-          MDNode([ConstantInt(Int32(1); ctx),
-                  ConstantInt(Int32(5); ctx)]; ctx))
+          MDNode([ConstantInt(Int32(1)),
+                  ConstantInt(Int32(5))]))
 end
 
 
@@ -78,12 +77,9 @@ end
 # compile to executable machine code
 function compile(@nospecialize(job::CompilerJob))
     # TODO: on 1.9, this actually creates a context. cache those.
-    JuliaContext() do ctx
-        compile(job, ctx)
+    asm, meta = JuliaContext() do ctx
+        GPUCompiler.compile(:obj, job)
     end
-end
-function compile(@nospecialize(job::CompilerJob), ctx)
-    asm, meta = GPUCompiler.compile(:obj, job; ctx)
 
     (image=asm, entry=LLVM.name(meta.entry))
 end

src/device/opencl/memory.jl

@@ -21,8 +21,8 @@ end
 # get a pointer to local memory, with known (static) or zero length (dynamic)
 @generated function emit_localmemory(::Type{T}, ::Val{len}=Val(0)) where {T,len}
     Context() do ctx
-        eltyp = convert(LLVMType, T; ctx)
-        T_ptr = convert(LLVMType, LLVMPtr{T,AS.Local}; ctx)
+        eltyp = convert(LLVMType, T)
+        T_ptr = convert(LLVMType, LLVMPtr{T,AS.Local})
 
         # create a function
         llvm_f, _ = create_function(T_ptr)
@@ -39,11 +39,11 @@ end
         alignment!(gv, Base.datatype_alignment(T))
 
         # generate IR
-        IRBuilder(ctx) do builder
-            entry = BasicBlock(llvm_f, "entry"; ctx)
+        IRBuilder() do builder
+            entry = BasicBlock(llvm_f, "entry")
             position!(builder, entry)
 
-            ptr = gep!(builder, gv_typ, gv, [ConstantInt(0; ctx), ConstantInt(0; ctx)])
+            ptr = gep!(builder, gv_typ, gv, [ConstantInt(0), ConstantInt(0)])
 
             untyped_ptr = bitcast!(builder, ptr, T_ptr)
 

src/device/opencl/printf.jl

@@ -29,26 +29,26 @@ end
     arg_types = [argspec...]
 
     Context() do ctx
-        T_void = LLVM.VoidType(ctx)
-        T_int32 = LLVM.Int32Type(ctx)
-        T_pint8 = LLVM.PointerType(LLVM.Int8Type(ctx))
+        T_void = LLVM.VoidType()
+        T_int32 = LLVM.Int32Type()
+        T_pint8 = LLVM.PointerType(LLVM.Int8Type())
 
         # create functions
-        param_types = LLVMType[convert(LLVMType, typ; ctx) for typ in arg_types]
+        param_types = LLVMType[convert(LLVMType, typ) for typ in arg_types]
         llvm_f, _ = create_function(T_int32, param_types)
         mod = LLVM.parent(llvm_f)
 
         # generate IR
-        IRBuilder(ctx) do builder
-            entry = BasicBlock(llvm_f, "entry"; ctx)
+        IRBuilder() do builder
+            entry = BasicBlock(llvm_f, "entry")
             position!(builder, entry)
 
             str = globalstring_ptr!(builder, String(fmt))
 
             # invoke printf and return
             printf_typ = LLVM.FunctionType(T_int32, [T_pint8]; vararg=true)
             printf = LLVM.Function(mod, "printf", printf_typ)
-            push!(function_attributes(printf), EnumAttribute("nobuiltin"; ctx))
+            push!(function_attributes(printf), EnumAttribute("nobuiltin"))
             chars = call!(builder, printf_typ, printf, [str, parameters(llvm_f)...])
 
             ret!(builder, chars)