From 7c4cc1c71c9053dd492f6e7731f3c6836a25952f Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 23 May 2022 22:28:54 +0200 Subject: archspec: add oneapi and dpcpp flag support (#30783) --- lib/spack/external/__init__.py | 2 +- .../archspec/json/cpu/microarchitectures.json | 322 +++++++++++++++++++++ 2 files changed, 323 insertions(+), 1 deletion(-) diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index ccca22ae3e..7537a98fb6 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.2 (commit 147942bd96219cf39e7001aef3644b43af76bdf6) +* Version: 0.1.4 (commit 53fc4ac91e9b4c5e4079f15772503a80bece72ad) argparse -------- diff --git a/lib/spack/external/archspec/json/cpu/microarchitectures.json b/lib/spack/external/archspec/json/cpu/microarchitectures.json index 839d83887e..7ead7a37f7 100644 --- a/lib/spack/external/archspec/json/cpu/microarchitectures.json +++ b/lib/spack/external/archspec/json/cpu/microarchitectures.json @@ -88,6 +88,20 @@ "name": "pentium4", "flags": "-march={name} -mtune=generic" } + ], + "oneapi": [ + { + "versions": ":", + "name": "pentium4", + "flags": "-march={name} -mtune=generic" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "pentium4", + "flags": "-march={name} -mtune=generic" + } ] } }, @@ -291,6 +305,20 @@ "name": "pentium4", "flags": "-march={name} -mtune=generic" } + ], + "oneapi": [ + { + "versions": ":", + "name": "pentium4", + "flags": "-march={name} -mtune=generic" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "pentium4", + "flags": "-march={name} -mtune=generic" + } ] } }, @@ -333,6 +361,18 @@ "versions": "16.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -384,6 +424,20 @@ "name": "corei7", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "name": "corei7", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "corei7", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -432,6 +486,20 @@ "name": "corei7", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "name": "corei7", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "corei7", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -490,6 +558,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -550,6 +630,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -615,6 +707,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -672,6 +776,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -732,6 +848,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -798,6 +926,20 @@ "name": "knl", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "name": "knl", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "knl", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -868,6 +1010,20 @@ "name": "skylake-avx512", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "name": "skylake-avx512", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "skylake-avx512", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -937,6 +1093,18 @@ "versions": "18.0:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1004,6 +1172,18 @@ "versions": "19.0.1:", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1098,6 +1278,20 @@ "name": "icelake-client", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "name": "icelake-client", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "name": "icelake-client", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1142,6 +1336,20 @@ "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", "flags": "-msse2" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse2" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse2" + } ] } }, @@ -1192,6 +1400,20 @@ "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", "flags": "-msse3" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse3" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse3" + } ] } }, @@ -1246,6 +1468,20 @@ "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", "flags": "-msse3" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse3" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse3" + } ] } }, @@ -1301,6 +1537,20 @@ "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", "flags": "-msse4.2" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse4.2" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "flags": "-msse4.2" + } ] } }, @@ -1360,6 +1610,22 @@ "name": "core-avx2", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1422,6 +1688,22 @@ "name": "core-avx2", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1485,6 +1767,22 @@ "name": "core-avx2", "flags": "-march={name} -mtune={name}" } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } ] } }, @@ -1543,6 +1841,30 @@ "name": "znver3", "flags": "-march={name} -mtune={name}" } + ], + "intel": [ + { + "versions": "16.0:", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } + ], + "oneapi": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } + ], + "dpcpp": [ + { + "versions": ":", + "warnings": "Intel's compilers may or may not optimize to the same degree for non-Intel microprocessors for optimizations that are not unique to Intel microprocessors", + "name": "core-avx2", + "flags": "-march={name} -mtune={name}" + } ] } }, -- cgit v1.2.3-60-g2f50