summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2022-06-07 10:51:34 +0200
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2022-07-20 08:10:41 +0200
commit83bf44f2fe03357b2359c47455c2d43d1e37056c (patch)
tree203a2f543ae1bf9f25663b64b77a3078c3b63607
parentc527b43d181ccbea3a6b8a1604b97b2baa281938 (diff)
downloadspack-83bf44f2fe03357b2359c47455c2d43d1e37056c.tar.gz
spack-83bf44f2fe03357b2359c47455c2d43d1e37056c.tar.bz2
spack-83bf44f2fe03357b2359c47455c2d43d1e37056c.tar.xz
spack-83bf44f2fe03357b2359c47455c2d43d1e37056c.zip
archspec: bump to v0.1.4 (#30856)
Fixes compiler flags for oneapi and dpcpp
-rw-r--r--lib/spack/external/__init__.py2
-rw-r--r--lib/spack/external/archspec/json/cpu/microarchitectures.json57
2 files changed, 49 insertions, 10 deletions
diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py
index 7537a98fb6..d1ad56ebbc 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 53fc4ac91e9b4c5e4079f15772503a80bece72ad)
+* Version: 0.1.4 (commit b8eea9df2b4204ff27d204452cd46f5199a0b423)
argparse
--------
diff --git a/lib/spack/external/archspec/json/cpu/microarchitectures.json b/lib/spack/external/archspec/json/cpu/microarchitectures.json
index 7ead7a37f7..d62480fdf0 100644
--- a/lib/spack/external/archspec/json/cpu/microarchitectures.json
+++ b/lib/spack/external/archspec/json/cpu/microarchitectures.json
@@ -85,21 +85,21 @@
"intel": [
{
"versions": ":",
- "name": "pentium4",
+ "name": "x86-64",
"flags": "-march={name} -mtune=generic"
}
],
"oneapi": [
{
"versions": ":",
- "name": "pentium4",
+ "name": "x86-64",
"flags": "-march={name} -mtune=generic"
}
],
"dpcpp": [
{
"versions": ":",
- "name": "pentium4",
+ "name": "x86-64",
"flags": "-march={name} -mtune=generic"
}
]
@@ -143,6 +143,20 @@
"name": "x86-64",
"flags": "-march={name} -mtune=generic -mcx16 -msahf -mpopcnt -msse3 -msse4.1 -msse4.2 -mssse3"
}
+ ],
+ "oneapi": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v2",
+ "flags": "-march={name} -mtune=generic"
+ }
+ ],
+ "dpcpp": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v2",
+ "flags": "-march={name} -mtune=generic"
+ }
]
}
},
@@ -200,6 +214,20 @@
"name": "x86-64",
"flags": "-march={name} -mtune=generic -mcx16 -msahf -mpopcnt -msse3 -msse4.1 -msse4.2 -mssse3 -mavx -mavx2 -mbmi -mbmi2 -mf16c -mfma -mlzcnt -mmovbe -mxsave"
}
+ ],
+ "oneapi": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v3",
+ "flags": "-march={name} -mtune=generic"
+ }
+ ],
+ "dpcpp": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v3",
+ "flags": "-march={name} -mtune=generic"
+ }
]
}
},
@@ -262,6 +290,20 @@
"name": "x86-64",
"flags": "-march={name} -mtune=generic -mcx16 -msahf -mpopcnt -msse3 -msse4.1 -msse4.2 -mssse3 -mavx -mavx2 -mbmi -mbmi2 -mf16c -mfma -mlzcnt -mmovbe -mxsave -mavx512f -mavx512bw -mavx512cd -mavx512dq -mavx512vl"
}
+ ],
+ "oneapi": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v4",
+ "flags": "-march={name} -mtune=generic"
+ }
+ ],
+ "dpcpp": [
+ {
+ "versions": "2021.2.0:",
+ "name": "x86-64-v4",
+ "flags": "-march={name} -mtune=generic"
+ }
]
}
},
@@ -302,22 +344,19 @@
"intel": [
{
"versions": "16.0:",
- "name": "pentium4",
- "flags": "-march={name} -mtune=generic"
+ "flags": "-march={name} -mtune={name}"
}
],
"oneapi": [
{
"versions": ":",
- "name": "pentium4",
- "flags": "-march={name} -mtune=generic"
+ "flags": "-march={name} -mtune={name}"
}
],
"dpcpp": [
{
"versions": ":",
- "name": "pentium4",
- "flags": "-march={name} -mtune=generic"
+ "flags": "-march={name} -mtune={name}"
}
]
}