diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2019-12-20 23:40:54 +0100 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-12-20 14:40:54 -0800 |
| commit | 80495d83edbf8a0624c3bf317343a337e9ef588a (patch) | |
| tree | 8ce718d68150f218a7747f46ffd90017210b7f3f | |
| parent | 87d0ac804e1cf87c2c257d18e8bb7f1ec44f7229 (diff) | |
| download | spack-80495d83edbf8a0624c3bf317343a337e9ef588a.tar.gz spack-80495d83edbf8a0624c3bf317343a337e9ef588a.tar.bz2 spack-80495d83edbf8a0624c3bf317343a337e9ef588a.tar.xz spack-80495d83edbf8a0624c3bf317343a337e9ef588a.zip | |
microarchitectures: fix ppc flags for clang (#14196)
| -rw-r--r-- | lib/spack/llnl/util/cpu/microarchitectures.json | 26 | ||||
| -rw-r--r-- | lib/spack/spack/test/llnl/util/cpu.py | 2 |
2 files changed, 10 insertions, 18 deletions
diff --git a/lib/spack/llnl/util/cpu/microarchitectures.json b/lib/spack/llnl/util/cpu/microarchitectures.json index 10cad1670a..55b40d65ae 100644 --- a/lib/spack/llnl/util/cpu/microarchitectures.json +++ b/lib/spack/llnl/util/cpu/microarchitectures.json @@ -994,8 +994,7 @@ }, "clang": { "versions": ":", - "family": "ppc64", - "flags": "-march={family} -mcpu=generic" + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1011,9 +1010,7 @@ }, "clang": { "versions": "3.9:", - "family": "ppc64", - "name": "pwr7", - "flags": "-march={family} -mcpu={name}" + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1036,9 +1033,7 @@ ], "clang": { "versions": "3.9:", - "family": "ppc64", - "name": "pwr8", - "flags": "-march={family} -mcpu={name}" + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1054,9 +1049,7 @@ }, "clang": { "versions": "3.9:", - "family": "ppc64", - "name": "pwr9", - "flags": "-march={family} -mcpu={name}" + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1072,8 +1065,7 @@ }, "clang": { "versions": ":", - "family": "ppc64le", - "flags": "-march={family} -mcpu=generic" + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1099,8 +1091,8 @@ "clang": { "versions": "3.9:", "family": "ppc64le", - "name": "pwr8", - "flags": "-march={family} -mcpu={name}" + "name": "power8", + "flags": "-mcpu={name} -mtune={name}" } } }, @@ -1118,8 +1110,8 @@ "clang": { "versions": "3.9:", "family": "ppc64le", - "name": "pwr9", - "flags": "-march={family} -mcpu={name}" + "name": "power9", + "flags": "-mcpu={name} -mtune={name}" } } }, diff --git a/lib/spack/spack/test/llnl/util/cpu.py b/lib/spack/spack/test/llnl/util/cpu.py index 2ed96e3724..2bf29c9ff8 100644 --- a/lib/spack/spack/test/llnl/util/cpu.py +++ b/lib/spack/spack/test/llnl/util/cpu.py @@ -218,7 +218,7 @@ def test_target_json_schema(): ('icelake', 'clang', '8.0.0', '-march=icelake-client -mtune=icelake-client'), ('zen2', 'clang', '9.0.0', '-march=znver2 -mtune=znver2'), - ('power9le', 'clang', '8.0.0', '-march=ppc64le -mcpu=pwr9'), + ('power9le', 'clang', '8.0.0', '-mcpu=power9 -mtune=power9'), ('thunderx2', 'clang', '6.0.0', '-mcpu=thunderx2t99'), # Test Intel on Intel CPUs ('sandybridge', 'intel', '17.0.2', '-march=corei7-avx -mtune=corei7-avx'), |