diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-08-26 12:58:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-26 12:58:20 +0200 |
commit | b6ea2a46d1821539c88e810ecdac538a72feff77 (patch) | |
tree | 879af435dc4e739e0a77ec35774d3833025cc5f3 | |
parent | a2f05880042d0e38eb2418a24668f87fc42f0f18 (diff) | |
download | spack-b6ea2a46d1821539c88e810ecdac538a72feff77.tar.gz spack-b6ea2a46d1821539c88e810ecdac538a72feff77.tar.bz2 spack-b6ea2a46d1821539c88e810ecdac538a72feff77.tar.xz spack-b6ea2a46d1821539c88e810ecdac538a72feff77.zip |
Update archspec to latest commit (#32368)
Modifications:
- [x] Add graviton3
- [x] Optimize __eq__ for microarchitectures
-rw-r--r-- | lib/spack/external/__init__.py | 2 | ||||
-rw-r--r-- | lib/spack/external/archspec/cpu/microarchitecture.py | 2 | ||||
-rw-r--r-- | lib/spack/external/archspec/json/cpu/microarchitectures.json | 107 |
3 files changed, 105 insertions, 6 deletions
diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index d1ad56ebbc..bcb9ed9bec 100644 --- a/lib/spack/external/__init__.py +++ b/lib/spack/external/__init__.py @@ -18,7 +18,7 @@ archspec * Homepage: https://pypi.python.org/pypi/archspec * Usage: Labeling, comparison and detection of microarchitectures -* Version: 0.1.4 (commit b8eea9df2b4204ff27d204452cd46f5199a0b423) +* Version: 0.1.4 (commit e2cfdc266174488dee78b8c9058e36d60dc1b548) argparse -------- diff --git a/lib/spack/external/archspec/cpu/microarchitecture.py b/lib/spack/external/archspec/cpu/microarchitecture.py index 410d83c3dc..125d36e61b 100644 --- a/lib/spack/external/archspec/cpu/microarchitecture.py +++ b/lib/spack/external/archspec/cpu/microarchitecture.py @@ -106,7 +106,7 @@ class Microarchitecture(object): self.name == other.name and self.vendor == other.vendor and self.features == other.features - and self.ancestors == other.ancestors + and self.parents == other.parents # avoid ancestors here and self.compilers == other.compilers and self.generation == other.generation ) diff --git a/lib/spack/external/archspec/json/cpu/microarchitectures.json b/lib/spack/external/archspec/json/cpu/microarchitectures.json index d62480fdf0..308f0e5152 100644 --- a/lib/spack/external/archspec/json/cpu/microarchitectures.json +++ b/lib/spack/external/archspec/json/cpu/microarchitectures.json @@ -1099,8 +1099,7 @@ "avx512cd", "avx512vbmi", "avx512ifma", - "sha", - "umip" + "sha" ], "compilers": { "gcc": [ @@ -1263,7 +1262,6 @@ "avx512vbmi", "avx512ifma", "sha_ni", - "umip", "clwb", "rdpid", "gfni", @@ -2249,7 +2247,7 @@ } }, "graviton2": { - "from": ["aarch64"], + "from": ["graviton"], "vendor": "ARM", "features": [ "fp", @@ -2319,6 +2317,107 @@ ] } }, + "graviton3": { + "from": ["graviton2"], + "vendor": "ARM", + "features": [ + "fp", + "asimd", + "evtstrm", + "aes", + "pmull", + "sha1", + "sha2", + "crc32", + "atomics", + "fphp", + "asimdhp", + "cpuid", + "asimdrdm", + "jscvt", + "fcma", + "lrcpc", + "dcpop", + "sha3", + "sm3", + "sm4", + "asimddp", + "sha512", + "sve", + "asimdfhm", + "dit", + "uscat", + "ilrcpc", + "flagm", + "ssbs", + "paca", + "pacg", + "dcpodp", + "svei8mm", + "svebf16", + "i8mm", + "bf16", + "dgh", + "rng" + ], + "compilers" : { + "gcc": [ + { + "versions": "4.8:4.8.9", + "flags": "-march=armv8-a" + }, + { + "versions": "4.9:5.9", + "flags": "-march=armv8-a+crc+crypto" + }, + { + "versions": "6:6.9", + "flags" : "-march=armv8.1-a" + }, + { + "versions": "7:7.9", + "flags" : "-march=armv8.2-a+crypto+fp16 -mtune=cortex-a72" + }, + { + "versions": "8.0:8.9", + "flags" : "-march=armv8.2-a+fp16+dotprod+crypto -mtune=cortex-a72" + }, + { + "versions": "9.0:9.9", + "flags" : "-march=armv8.4-a+crypto+rcpc+sha3+sm4+sve+rng+nodotprod -mtune=neoverse-v1" + }, + { + "versions": "10.0:", + "flags" : "-march=armv8.4-a+crypto+rcpc+sha3+sm4+sve+rng+ssbs+i8mm+bf16+nodotprod -mtune=neoverse-v1" + } + + ], + "clang" : [ + { + "versions": "3.9:4.9", + "flags" : "-march=armv8.2-a+fp16+crc+crypto" + }, + { + "versions": "5:10", + "flags" : "-march=armv8.2-a+fp16+rcpc+dotprod+crypto" + }, + { + "versions": "11:", + "flags" : "-march=armv8.4-a+sve+ssbs+fp16+bf16+crypto+i8mm+rng" + } + ], + "arm" : [ + { + "versions": "20:21.9", + "flags" : "-march=armv8.2-a+sve+fp16+rcpc+dotprod+crypto" + }, + { + "versions": "22:", + "flags" : "-march=armv8.4-a+sve+ssbs+fp16+bf16+crypto+i8mm+rng" + } + ] + } + }, "m1": { "from": ["aarch64"], "vendor": "Apple", |