microarchitectures: Fix icelake (#18151)

Some of the feature flags are named differently and clwb is missing on
my i7-1065G7. cascadelake and cannonlake might have similar problems but
I do not have access to those architectures to test.

3 files changed, 35 insertions, 6 deletions

diff --git a/lib/spack/llnl/util/cpu/microarchitectures.json b/lib/spack/llnl/util/cpu/microarchitectures.json
index e94146bf85..3742d122e9 100644
--- a/lib/spack/llnl/util/cpu/microarchitectures.json
+++ b/lib/spack/llnl/util/cpu/microarchitectures.json
@@ -652,15 +652,14 @@
         "avx512cd",
         "avx512vbmi",
         "avx512ifma",
-        "sha",
+        "sha_ni",
         "umip",
-        "clwb",
         "rdpid",
         "gfni",
-        "avx512vbmi2",
-        "avx512vpopcntdq",
-        "avx512bitalg",
-        "avx512vnni",
+        "avx512_vbmi2",
+        "avx512_vpopcntdq",
+        "avx512_bitalg",
+        "avx512_vnni",
         "vpclmulqdq",
         "vaes"
       ],
diff --git a/lib/spack/spack/test/data/targets/linux-fedora32-icelake b/lib/spack/spack/test/data/targets/linux-fedora32-icelake
new file mode 100644
index 0000000000..2dcf1b9c5b
--- /dev/null
+++ b/lib/spack/spack/test/data/targets/linux-fedora32-icelake
@@ -0,0 +1,27 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 126
+model name	: Intel(R) Core(TM) i7-1065G7 CPU @ 1.30GHz
+stepping	: 5
+microcode	: 0x78
+cpu MHz		: 1091.701
+cache size	: 8192 KB
+physical id	: 0
+siblings	: 8
+core id		: 0
+cpu cores	: 4
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 27
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid avx512f avx512dq rdseed adx smap avx512ifma clflushopt intel_pt avx512cd sha_ni avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves split_lock_detect dtherm ida arat pln pts hwp hwp_act_window hwp_epp hwp_pkg_req avx512vbmi umip pku ospke avx512_vbmi2 gfni vaes vpclmulqdq avx512_vnni avx512_bitalg avx512_vpopcntdq rdpid fsrm md_clear flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple pml ept_mode_based_exec tsc_scaling
+bugs		: spectre_v1 spectre_v2 spec_store_bypass swapgs itlb_multihit
+bogomips	: 2995.20
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
diff --git a/lib/spack/spack/test/llnl/util/cpu.py b/lib/spack/spack/test/llnl/util/cpu.py
index db2beadaf1..f1d5ac06de 100644
--- a/lib/spack/spack/test/llnl/util/cpu.py
+++ b/lib/spack/spack/test/llnl/util/cpu.py
@@ -34,6 +34,7 @@ from llnl.util.cpu import Microarchitecture  # noqa
     'linux-centos7-power8le',
     'linux-centos7-thunderx2',
     'linux-centos7-cascadelake',
+    'linux-fedora32-icelake',
     'darwin-mojave-ivybridge',
     'darwin-mojave-haswell',
     'darwin-mojave-skylake',
@@ -216,6 +217,8 @@ def test_target_json_schema():
     ('icelake', 'clang', '6.0.0', '-march=icelake -mtune=icelake'),
     ('icelake', 'clang', '8.0.0',
      '-march=icelake-client -mtune=icelake-client'),
+    ('icelake', 'gcc', '8.1.0',
+     '-march=icelake-client -mtune=icelake-client'),
     ('zen2', 'clang', '9.0.0', '-march=znver2 -mtune=znver2'),
     ('power9le', 'clang', '8.0.0', '-mcpu=power9 -mtune=power9'),
     ('thunderx2', 'clang', '6.0.0', '-mcpu=thunderx2t99'),