[Platforms] Fix flags for aarch64 microarchitectures (#205)

Author: giordano

Manifest.toml

@@ -1,178 +1,186 @@
 # This file is machine-generated - editing it directly is not advised
 
-[[ArgTools]]
+julia_version = "1.7.2"
+manifest_format = "2.0"
+
+[[deps.ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
 
-[[Artifacts]]
+[[deps.Artifacts]]
 uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 
-[[Base64]]
+[[deps.Base64]]
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
-[[CodecZlib]]
+[[deps.CodecZlib]]
 deps = ["TranscodingStreams", "Zlib_jll"]
 git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
 uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
 version = "0.7.0"
 
-[[Dates]]
+[[deps.Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
-[[Downloads]]
+[[deps.Downloads]]
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
-[[InteractiveUtils]]
+[[deps.InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
-[[JLLWrappers]]
+[[deps.JLLWrappers]]
 deps = ["Preferences"]
 git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 version = "1.4.1"
 
-[[JSON]]
+[[deps.JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
 git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 version = "0.21.3"
 
-[[LibCURL]]
+[[deps.LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
 uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
 
-[[LibCURL_jll]]
+[[deps.LibCURL_jll]]
 deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
 uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
 
-[[LibGit2]]
+[[deps.LibGit2]]
 deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 
-[[LibGit2_jll]]
+[[deps.LibGit2_jll]]
 deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
 uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
 
-[[LibSSH2_jll]]
+[[deps.LibSSH2_jll]]
 deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
 uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 
-[[Libdl]]
+[[deps.Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
-[[Logging]]
+[[deps.Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
-[[Markdown]]
+[[deps.Markdown]]
 deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
-[[MbedTLS_jll]]
+[[deps.MbedTLS_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
 
-[[Mmap]]
+[[deps.Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
-[[MozillaCACerts_jll]]
+[[deps.MozillaCACerts_jll]]
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
-[[NetworkOptions]]
+[[deps.NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
-[[OutputCollectors]]
+[[deps.OrderedCollections]]
+git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
+uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+version = "1.4.1"
+
+[[deps.OutputCollectors]]
 git-tree-sha1 = "5d3f2b3b2e2a9d7d6f1774c78e94530ac7f360cc"
 uuid = "6c11c7d4-943b-4e2b-80de-f2cfc2930a8c"
 version = "0.1.1"
 
-[[Parsers]]
+[[deps.Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "13468f237353112a01b2d6b32f3d0f80219944aa"
+git-tree-sha1 = "85b5da0fa43588c75bb1ff986493443f821c70b7"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.2"
+version = "2.2.3"
 
-[[Pkg]]
+[[deps.Pkg]]
 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.Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
+git-tree-sha1 = "d3538e7f8a790dc8903519090857ef8e1283eecd"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.3"
+version = "1.2.5"
 
-[[Printf]]
+[[deps.Printf]]
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
-[[REPL]]
+[[deps.REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
-[[Random]]
+[[deps.Random]]
 deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
-[[SHA]]
+[[deps.SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 
-[[Scratch]]
+[[deps.Scratch]]
 deps = ["Dates"]
 git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda"
 uuid = "6c6a2e73-6563-6170-7368-637461726353"
 version = "1.1.0"
 
-[[Serialization]]
+[[deps.Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
-[[SimpleBufferStream]]
+[[deps.SimpleBufferStream]]
 git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
 uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
 version = "1.1.0"
 
-[[Sockets]]
+[[deps.Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
-[[TOML]]
+[[deps.TOML]]
 deps = ["Dates"]
 uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 
-[[Tar]]
+[[deps.Tar]]
 deps = ["ArgTools", "SHA"]
 uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 
-[[Test]]
+[[deps.Test]]
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
-[[TranscodingStreams]]
+[[deps.TranscodingStreams]]
 deps = ["Random", "Test"]
 git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c"
 uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
 version = "0.9.6"
 
-[[UUIDs]]
+[[deps.UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
-[[Unicode]]
+[[deps.Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
-[[Zlib_jll]]
+[[deps.Zlib_jll]]
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
-[[nghttp2_jll]]
+[[deps.nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
 
-[[p7zip_jll]]
+[[deps.p7zip_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 
-[[pigz_jll]]
+[[deps.pigz_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
 git-tree-sha1 = "3c0c0b0c133b6ab53e1af05dc526091ce8781f16"
 uuid = "1bc43ea1-30af-5bc8-a9d4-c018457e6e3e"

Project.toml

@@ -12,6 +12,7 @@ LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 LibGit2_jll = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 OutputCollectors = "6c11c7d4-943b-4e2b-80de-f2cfc2930a8c"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -27,6 +28,7 @@ pigz_jll = "1bc43ea1-30af-5bc8-a9d4-c018457e6e3e"
 [compat]
 CodecZlib = "0.5, 0.6, 0.7"
 JSON = "0.21"
+OrderedCollections = "1.4.1"
 OutputCollectors = "0.1"
 Scratch = "1.0"
 SimpleBufferStream = "1"

src/Platforms.jl

@@ -1,4 +1,5 @@
 using Base.BinaryPlatforms
+using OrderedCollections
 
 export AnyPlatform
 
@@ -91,33 +92,41 @@ end
 const ARCHITECTURE_FLAGS = Dict(
     # Many compiler flags are the same across clang and gcc, store those in "common"
     "common" => Dict(
-        "i686" => Dict(
+        "i686" => OrderedDict(
             "pentium4" => ["-march=pentium4", "-mtune=generic"],
             "prescott" => ["-march=prescott", "-mtune=prescott"],
         ),
-        "x86_64" => Dict(
+        "x86_64" => OrderedDict(
             # Better be always explicit about `-march` & `-mtune`:
             # https://lemire.me/blog/2018/07/25/it-is-more-complicated-than-i-thought-mtune-march-in-gcc/
             "x86_64" => ["-march=x86-64", "-mtune=generic"],
             "avx"    => ["-march=sandybridge", "-mtune=sandybridge"],
             "avx2"   => ["-march=haswell", "-mtune=haswell"],
             "avx512" => ["-march=skylake-avx512", "-mtune=skylake-avx512"],
         ),
-        "armv6l" => Dict(
+        "armv6l" => OrderedDict(
             # This is the only known armv6l chip that runs Julia, so it's the only one we care about.
             "arm1176jzfs" => ["-mcpu=arm1176jzf-s", "-mfpu=vfp", "-mfloat-abi=hard"],
         ),
-        "armv7l" => Dict(
+        "armv7l" => OrderedDict(
             # Base armv7l architecture, with the most basic of FPU's
             "armv7l"   => ["-march=armv7-a", "-mtune=generic-armv7-a", "-mfpu=vfpv3", "-mfloat-abi=hard"],
             # armv7l plus NEON and vfpv4, (Raspberry Pi 2B+, RK3328, most boards Elliot has access to)
             "neonvfpv4" => ["-march=armv7-a", "-mtune=cortex-a53", "-mfpu=neon-vfpv4", "-mfloat-abi=hard"],
         ),
-        "aarch64" => Dict(
-            # Base armv8.0-a architecture, tune for generic cortex-a57
-            "armv8_0"  => ["-march=armv8-a", "-mtune=cortex-a57"],
+        "aarch64" => OrderedDict(
+            # For GCC, see: <https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html>.  For
+            # LLVM, for the list of features see
+            # <https://github.com/llvm/llvm-project/blob/1bcc28b884ff4fbe2ecc011b8ea2b84e7987167b/llvm/include/llvm/Support/AArch64TargetParser.def>
+            # and
+            # <https://github.com/llvm/llvm-project/blob/85e9b2687a13d1908aa86d1b89c5ce398a06cd39/llvm/lib/Target/AArch64/AArch64.td>.
+            # Run `clang --print-supported-cpus` for the list of values of `-mtune`.
+            "armv8_0"        => ["-march=armv8-a", "-mtune=cortex-a57"],
+            "armv8_1"        => ["-march=armv8.1-a", "-mtune=thunderx2t99"],
+            "armv8_2_crypto" => ["-march=armv8.2-a+aes+sha2", "-mtune=cortex-a76"],
+            "a64fx"          => ["-march=armv8.2-a+aes+sha2+fp16+sve", "-mtune=a64fx"],
         ),
-        "powerpc64le" => Dict(
+        "powerpc64le" => OrderedDict(
             "power8"  => ["-mcpu=power8", "-mtune=power8"],
             # Note that power9 requires GCC 6+, and we need CPUID for this
             #"power9"  => ["-mcpu=power9", "-mtune=power9"],
@@ -126,21 +135,13 @@ const ARCHITECTURE_FLAGS = Dict(
         )
     ),
     "gcc" => Dict(
-        "aarch64" => Dict(
-            # `clang`/`gcc` disagree on `rdm(a)`
-            "armv8_1"            => ["-march=armv8-a+lse+crc+rdma", "-mtune=thunderx2t99"],
-            # Note that these targets require gcc 9+
-            "armv8_2_crypto"     => ["-march=armv8-a+lse+crc+rdma+aes+sha2", "-mtune=cortex-a76"],
-            "armv8_4_crypto_sve" => ["-march=armv8-a+les+crc+rdma+aes+sha2+fp16fml+dotprod+sve", "-mtune=cortex-a76"]
+        "aarch64" => OrderedDict(
+            "apple_m1"       => ["-march=armv8.5-a+aes+sha2+sha3+fp16fml+fp16+rcpc+dotprod", "-mtune=cortex-a76"],
         ),
     ),
     "clang" => Dict(
-        "aarch64" => Dict(
-            # `clang`/`gcc` disagree on `rdm` vs. `rdma`
-            "armv8_1"            => ["-march=armv8-a+lse+crc+rdm", "-mtune=thunderx2t99"],
-            # Note that these targets require clang 9+
-            "armv8_2_crypto"     => ["-march=armv8-a+lse+crc+rdm+aes+sha2", "-mtune=cortex-a76"],
-            "armv8_4_crypto_sve" => ["-march=armv8-a+les+crc+rdm+aes+sha2+fp16fml+dotprod+sve", "-mtune=cortex-a76"]
+        "aarch64" => OrderedDict(
+            "apple_m1"       => ["-march=armv8.5-a+aes+sha2+sha3+fp16fml+fp16+rcpc+dotprod", "-mtune=apple-a12"],
         ),
     ),
 )

src/Rootfs.jl

@@ -487,18 +487,27 @@ function gcc_version(p::AbstractPlatform,GCC_builds::Vector{GCCBuild},
         # "thunderx2t99" introduced in GCC v7.1:
         # https://www.gnu.org/software/gcc/gcc-7/changes.html
         GCC_builds = filter(b -> getversion(b) >= v"7.1", GCC_builds)
-    elseif march(p) in ("armv8_2_crypto", "armv8_4_crypto_sve")
-        # "+aes" and "+sha2" extensions for aarch64 introduced in GCC v8:
-        # https://www.gnu.org/software/gcc/gcc-8/changes.html
-        GCC_builds = filter(b -> getversion(b) >= v"8.1", GCC_builds)
+    elseif march(p) in ("armv8_2_crypto",)
+        # `cortex-a76` target introduced in GCC v9.1:
+        # https://www.gnu.org/software/gcc/gcc-9/changes.html
+        GCC_builds = filter(b -> getversion(b) >= v"9.1", GCC_builds)
+    elseif march(p) in ("a64fx",)
+        # `a64fx` target introduced in GCC v10.3:
+        # https://www.gnu.org/software/gcc/gcc-10/changes.html
+        GCC_builds = filter(b -> getversion(b) >= v"10.3", GCC_builds)
+    elseif march(p) in ("apple_m1",)
+        # At the moment we can only target this CPU with GCC 12
+        GCC_builds = filter(b -> getversion(b) >= v"12", GCC_builds)
     end
 
     return getversion.(GCC_builds)
 end
 
 function llvm_version(p::AbstractPlatform, LLVM_builds::Vector{LLVMBuild})
-    if march(p) in ("armv8_2_crypto", "armv8_4_crypto_sve")
+    if march(p) in ("armv8_2_crypto",)
         LLVM_builds = filter(b -> getversion(b) >= v"9.0", LLVM_builds)
+    elseif march(p) in ("a64fx", "apple_m1",)
+        LLVM_builds = filter(b -> getversion(b) >= v"11.0", LLVM_builds)
     end
     return getversion.(LLVM_builds)
 end
@@ -827,8 +836,22 @@ function expand_microarchitectures(platform::AbstractPlatform)
         return [platform]
     end
 
-    # Otherwise, return a bunch of Platform objects with appropriately-set `march` tags
-    return map(get_all_march_names(arch(platform))) do march
+    # Otherwise, return a bunch of Platform objects with appropriately-set `march` tags, but
+    # first filter out some meaningless combinations of microarchitectures.
+    all_marchs = filter(get_all_march_names(arch(platform))) do march
+        if (!Sys.isapple(platform) && march == "apple_m1") ||
+            (Sys.isapple(platform) && arch(platform) == "aarch64" && march ∉ ("armv8_0", "apple_m1"))
+            # `apple_m1` makes sense only on macOS, and the only aarch64 microarchitectures
+            # that make sense on macOS are M1 and the generic one.
+            return false
+        elseif march == "a64fx" && !(Sys.islinux(platform) && libc(platform) == "glibc")
+            # Let's be honest: it's unlikely we'll see Alpine Linux on A64FX.
+            return false
+        end
+        return true
+    end
+
+    return map(all_marchs) do march
         p = deepcopy(platform)
         p["march"] = march
         return p