Add test for dual LP64/ILP64 MKL v2022+

Author: staticfloat

test/Manifest.toml

@@ -32,9 +32,10 @@ deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[JLLWrappers]]
-git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0"
+deps = ["Preferences"]
+git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.2.0"
+version = "1.4.0"
 
 [[LazyArtifacts]]
 deps = ["Artifacts", "Pkg"]
@@ -64,9 +65,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[MKL_jll]]
 deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"]
-git-tree-sha1 = "c253236b0ed414624b083e6b72bfe891fbd2c7af"
+git-tree-sha1 = "e595b205efd49508358f7dc670a940c790204629"
 uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
-version = "2021.1.1+1"
+version = "2022.0.0+0"
 
 [[Markdown]]
 deps = ["Base64"]
@@ -84,18 +85,24 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[OpenBLAS32_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "ba4a8f683303c9082e84afba96f25af3c7fb2436"
+git-tree-sha1 = "9c6c2ed4b7acd2137b878eb96c68e63b76199d0f"
 uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2"
-version = "0.3.12+1"
+version = "0.3.17+0"
 
 [[OpenBLAS_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
 
 [[Pkg]]
-deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs"]
+deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
+[[Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.2.3"
+
 [[Printf]]
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -105,7 +112,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["Serialization"]
+deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[SHA]]
@@ -139,3 +146,7 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+
+[[p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

test/direct.jl

@@ -1,4 +1,4 @@
-using Libdl, Test, OpenBLAS_jll, OpenBLAS32_jll
+using Libdl, Test, OpenBLAS_jll, OpenBLAS32_jll, MKL_jll
 
 include("utils.jl")
 
@@ -180,3 +180,43 @@ end
     self_traces = filter(entry -> string(entry.file) == @__FILE__, stacktraces[1])
     @test length(self_traces) == 3
 end
+
+if MKL_jll.is_available() && Sys.WORD_SIZE == 64
+    # Since MKL v2022, we can explicitly link against ILP64-suffixed symbols
+    @testset "MKL v2022 ILP64 loading" begin
+        # Load the ILP64 interface library.  Remember, you must load the `core`
+        # and a `threading` library first, with `RTLD_LAZY` for this to work!
+        lbt_forward(lbt_handle, libmkl_rt; clear=true, suffix_hint = "64")
+
+        # Test that we have only one library loaded
+        config = lbt_get_config(lbt_handle)
+        libs = unpack_loaded_libraries(config)
+        @test length(libs) == 1
+
+        # Test that it's MKL and it's correctly identified
+        @test libs[1].libname == MKL_jll.libmkl_rt_path
+        @test libs[1].interface == LBT_INTERFACE_ILP64
+
+        # Test that `dgemm` forwards to `dgemm_` within the MKL binary
+        mkl_dgemm = dlsym(MKL_jll.libmkl_rt_handle, :dgemm_64)
+        @test lbt_get_forward(lbt_handle, "dgemm_", LBT_INTERFACE_ILP64) == mkl_dgemm
+    end
+
+    @testset "MKL v2022 dual-interface loading" begin
+        # Also test that we can load both ILP64 and LP64 at the same time!
+        lbt_forward(lbt_handle, libmkl_rt; clear=true, suffix_hint = "64")
+        lbt_forward(lbt_handle, libmkl_rt; suffix_hint = "")
+
+        # Test that we have both libraries loaded
+        config = lbt_get_config(lbt_handle)
+        libs = unpack_loaded_libraries(config)
+        @test length(libs) == 2
+
+        # Test that it's MKL and it's correctly identified
+        sort!(libs; by = l -> l.libname)
+        @test libs[1].libname == libmkl_rt
+        @test libs[1].interface == LBT_INTERFACE_ILP64
+        @test libs[2].libname == libmkl_rt
+        @test libs[2].interface == LBT_INTERFACE_LP64
+    end
+end