Update match_entry_t to remove internal codes and bits

Remove brand_code, model_bits and model_code fields, add a new brand sub-struct. There fields were complicated to manage, adding complex functions to make it work. amd_bits_t and intel_bits_t enums were truncated, I had to replace them with #define in 2e01aa0303. Some of these #define were conflicting with other C headers (ctype.h on OpenBSD, corecrt_wctype.h on Windows), that is why I wanted to get rid of it. I updated some CPU codenames meanwhile for more consistency. Fix #212.
2025-10-03 11:01:30 +00:00 · 2025-04-26 19:46:37 +02:00 · 2025-04-26 19:46:37 +02:00 · dc06877f4f
commit dc06877f4f
parent 447bc0d8d9
144 changed files with 1018 additions and 2070 deletions
--- a/tests/amd/bobcat/brazos-zacate.test
+++ b/tests/amd/bobcat/brazos-zacate.test
@ -102,5 +102,5 @@ general
 -1
 -1
 64 (authoritative)
-Brazos Zacate (Dual-core)
+E-Series (Zacate)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor ssse3 cx16 syscall popcnt mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
--- a/tests/amd/bulldozer/bald-eagle-x4.test
+++ b/tests/amd/bulldozer/bald-eagle-x4.test
@ -218,5 +218,5 @@ general
 -1
 -1
 128 (authoritative)
-Bald Eagle X4
+R-Series (Bald Eagle)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
--- a/tests/amd/bulldozer/godavari-x4.test
+++ b/tests/amd/bulldozer/godavari-x4.test
@ -110,5 +110,5 @@ general
 -1
 -1
 128 (authoritative)
-Godavari X4
+Athlon X4 (Godavari)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
--- a/tests/amd/bulldozer/kaveri-x4.test
+++ b/tests/amd/bulldozer/kaveri-x4.test
@ -222,5 +222,5 @@ general
 -1
 -1
 128 (authoritative)
-Kaveri X4
+Athlon X4 (Kaveri)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
--- a/tests/amd/bulldozer/opteron-abu-dhabi.test
+++ b/tests/amd/bulldozer/opteron-abu-dhabi.test
@ -846,5 +846,5 @@ general
 -1
 -1
 128 (authoritative)
-Abu Dhabi
+Opteron (Abu Dhabi)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
--- a/tests/amd/bulldozer/opteron-interlagos.test
+++ b/tests/amd/bulldozer/opteron-interlagos.test
@ -642,5 +642,5 @@ general
 -1
 -1
 128 (authoritative)
-Interlagos
+Opteron (Interlagos)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma4 cpb
--- a/tests/amd/bulldozer/vishera-x4.test
+++ b/tests/amd/bulldozer/vishera-x4.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (authoritative)
-Vishera X4
+FX (Vishera)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
--- a/tests/amd/bulldozer/zambezi-x3.test
+++ b/tests/amd/bulldozer/zambezi-x3.test
@ -324,5 +324,5 @@ general
 -1
 -1
 128 (authoritative)
-Zambezi X3
+FX (Zambezi)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma4 cpb
--- a/tests/amd/bulldozer/zambezi-x4.test
+++ b/tests/amd/bulldozer/zambezi-x4.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (authoritative)
-Zambezi X4
+FX (Zambezi)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma4 cpb
--- a/tests/amd/jaguar/athlon-kabini.test
+++ b/tests/amd/jaguar/athlon-kabini.test
@ -226,5 +226,5 @@ general
 -1
 -1
 128 (authoritative)
-Kabini X4
+Athlon X4 (Kabini)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc f16c pfi bmi1
--- a/tests/amd/jaguar/beema-x4.test
+++ b/tests/amd/jaguar/beema-x4.test
@ -222,5 +222,5 @@ general
 -1
 -1
 128 (authoritative)
-Beema X4
+A-Series (Beema)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc f16c rdrand cpb pa bmi1
--- a/tests/amd/jaguar/kabini-x4.test
+++ b/tests/amd/jaguar/kabini-x4.test
@ -222,5 +222,5 @@ general
 -1
 -1
 128 (authoritative)
-Kabini X4
+A-Series (Kabini)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc f16c pfi bmi1
--- a/tests/amd/jaguar/steppe-eagle-x2.test
+++ b/tests/amd/jaguar/steppe-eagle-x2.test
@ -128,5 +128,5 @@ general
 -1
 -1
 128 (authoritative)
-Steppe Eagle X2
+G-Series (Steppe Eagle)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc f16c rdrand pa bmi1
--- a/tests/amd/k10/magny-cours.test
+++ b/tests/amd/k10/magny-cours.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (authoritative)
-Magny-Cours Opteron
+Opteron (Magny-Cours)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
--- a/tests/amd/zen3/ryzen7-rembrandt-r.test
+++ b/tests/amd/zen3/ryzen7-rembrandt-r.test
@ -1054,5 +1054,5 @@ general
 1
 0
 256 (authoritative)
-Ryzen 7 (Rembrandt)
+Ryzen 7 (Rembrandt-R)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd hwpstate constant_tsc fma3 f16c rdrand x2apic cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/hygon/dhyana/dhyana_7.test
+++ b/tests/hygon/dhyana/dhyana_7.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (authoritative)
-C86 7 (Dhyana)
+C86 (Dhyana)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw skinit wdt ts ttp tm_amd hwpstate constant_tsc fma3 f16c rdrand aperfmperf avx2 bmi1 bmi2 rdseed adx
--- a/tests/intel/ia-32/p6/yonah-core-duo-t2400.test
+++ b/tests/intel/ia-32/p6/yonah-core-duo-t2400.test
@ -98,5 +98,5 @@ general
 -1
 -1
 64 (non-authoritative)
-Yonah (Core Duo)
+Core Duo (Yonah)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
--- a/tests/intel/ia-32/p6/yonah-core-duo-t2600.test
+++ b/tests/intel/ia-32/p6/yonah-core-duo-t2600.test
@ -102,5 +102,5 @@ general
 -1
 -1
 64 (non-authoritative)
-Yonah (Core Duo)
+Core Duo (Yonah)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
--- a/tests/intel/ia-32/p6/yonah-core-solo.test
+++ b/tests/intel/ia-32/p6/yonah-core-solo.test
@ -98,5 +98,5 @@ general
 -1
 -1
 64 (non-authoritative)
-Yonah (Core Duo)
+Core Duo (Yonah)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
--- a/tests/intel/x86-64/core/allendale-celeron.test
+++ b/tests/intel/x86-64/core/allendale-celeron.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Allendale (Celeron)
+Celeron (Allendale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm lm lahf_lm
--- a/tests/intel/x86-64/core/allendale-core-2-duo.test
+++ b/tests/intel/x86-64/core/allendale-core-2-duo.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Allendale (Core 2 Duo)
+Core 2 Duo (Allendale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/allendale-pentium.test
+++ b/tests/intel/x86-64/core/allendale-pentium.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Allendale (Pentium)
+Pentium Dual-Core (Allendale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/conroe-core-2-duo.test
+++ b/tests/intel/x86-64/core/conroe-core-2-duo.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Conroe (Core 2 Duo)
+Core 2 Duo (Conroe)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/conroe-l-celeron.test
+++ b/tests/intel/x86-64/core/conroe-l-celeron.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Conroe-L (Celeron)
+Celeron (Conroe-L)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/kentsfield-core-2-quad.test
+++ b/tests/intel/x86-64/core/kentsfield-core-2-quad.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Kentsfield (Core 2 Quad)
+Core 2 Quad (Kentsfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm lm lahf_lm
--- a/tests/intel/x86-64/core/merom-core-2-duo-2m.test
+++ b/tests/intel/x86-64/core/merom-core-2-duo-2m.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Merom (Core 2 Duo) 2048K
+Core 2 Duo (Merom-2M)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/merom-core-2-duo-4m.test
+++ b/tests/intel/x86-64/core/merom-core-2-duo-4m.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Merom (Core 2 Duo) 4096K
+Core 2 Duo (Merom)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/penryn-core-2-duo-3m.test
+++ b/tests/intel/x86-64/core/penryn-core-2-duo-3m.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Penryn (Core 2 Duo) 3M
+Core 2 Duo (Penryn-3M)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
--- a/tests/intel/x86-64/core/penryn-l-celeron.test
+++ b/tests/intel/x86-64/core/penryn-l-celeron.test
@ -111,5 +111,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Celeron Penryn L
+Celeron (Penryn-L)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm syscall xd xsave osxsave lm lahf_lm
--- a/tests/intel/x86-64/core/penryn-pentium-m.test
+++ b/tests/intel/x86-64/core/penryn-pentium-m.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Penryn (Core 2 Duo)
+Pentium Dual-Core (Penryn-L)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm syscall xd xsave osxsave lm lahf_lm
--- a/tests/intel/x86-64/core/wolfdale-celeron.test
+++ b/tests/intel/x86-64/core/wolfdale-celeron.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Celeron Wolfdale 1M
+Celeron (Wolfdale-3M)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd xsave osxsave lm lahf_lm
--- a/tests/intel/x86-64/core/wolfdale-pentium.test
+++ b/tests/intel/x86-64/core/wolfdale-pentium.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Wolfdale (Core 2 Duo) 2M
+Pentium (Wolfdale-3M)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
--- a/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
+++ b/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Yorkfield (Core 2 Quad) 2M
+Core 2 Quad (Yorkfield-6M)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd xsave osxsave lm lahf_lm
--- a/tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test
+++ b/tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test
@ -98,5 +98,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Yorkfield (Core 2 Quad) 6M
+Core 2 Quad (Yorkfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
--- a/tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test
+++ b/tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test
@ -1038,5 +1038,5 @@ general
 1
 0
 128 (non-authoritative)
-Rocket Lake (Core i7)
+Core i7 (Rocket Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test
+++ b/tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test
@ -810,5 +810,5 @@ general
 1
 0
 128 (non-authoritative)
-Rocket Lake (Xeon-E)
+Xeon E (Rocket Lake)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl sgx rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test
@ -1378,7 +1378,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-H (Core i7)
+Core i7 (Alder Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1412,5 +1412,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-H (Core i7)
+Core i7 (Alder Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test
@ -1378,7 +1378,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-H (Core i9)
+Core i9 (Alder Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1412,5 +1412,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-H (Core i9)
+Core i9 (Alder Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test
@ -1678,7 +1678,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-HX (Core i7)
+Core i7 (Alder Lake-HX)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1712,5 +1712,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-HX (Core i7)
+Core i7 (Alder Lake-HX)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test
@ -826,7 +826,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-P (Core i3)
+Core i3 (Alder Lake-P)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -860,5 +860,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-P (Core i3)
+Core i3 (Alder Lake-P)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test
@ -894,5 +894,5 @@ general
 1
 0
 128 (non-authoritative)
-Alder Lake-S (Core i5)
+Core i5 (Alder Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test
@ -1654,7 +1654,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-S (Core i9)
+Core i9 (Alder Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1688,5 +1688,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-S (Core i9)
+Core i9 (Alder Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test
@ -310,5 +310,5 @@ general
 1
 0
 128 (non-authoritative)
-Alder Lake-S (Pentium)
+Pentium Gold (Alder Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/alder-lake-u-pentium.test
+++ b/tests/intel/x86-64/golden-cove/alder-lake-u-pentium.test
@ -434,7 +434,7 @@ performance
 1
 0
 128 (non-authoritative)
-Alder Lake-U (Pentium)
+Pentium Gold (Alder Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -468,5 +468,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Alder Lake-U (Pentium)
+Pentium Gold (Alder Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test
+++ b/tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test
@ -1398,7 +1398,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1432,5 +1432,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test
+++ b/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test
@ -3110,5 +3110,5 @@ general
 1
 0
 128 (non-authoritative)
-Sapphire Rapids-WS (Xeon w7)
+Xeon w7 (Sapphire Rapids-WS)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w9.test
+++ b/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w9.test
@ -5574,5 +5574,5 @@ general
 1
 0
 128 (non-authoritative)
-Sapphire Rapids-WS (Xeon w9)
+Xeon w9 (Sapphire Rapids-WS)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/haswell/broadwell-e-core-i7.test
+++ b/tests/intel/x86-64/haswell/broadwell-e-core-i7.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Broadwell-E (Core i7)
+Core i7 (Broadwell-E)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm rdseed adx
--- a/tests/intel/x86-64/haswell/crystal-well-core-i7.test
+++ b/tests/intel/x86-64/haswell/crystal-well-core-i7.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Haswell (Core i7)
+Core i7 (Haswell)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2
--- a/tests/intel/x86-64/haswell/haswell-core-i3.test
+++ b/tests/intel/x86-64/haswell/haswell-core-i3.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Haswell (Core i3)
+Core i3 (Haswell)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand avx2 bmi1 bmi2
--- a/tests/intel/x86-64/haswell/haswell-core-i5.test
+++ b/tests/intel/x86-64/haswell/haswell-core-i5.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Haswell (Core i5)
+Core i5 (Haswell)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2
--- a/tests/intel/x86-64/haswell/haswell-core-i7.test
+++ b/tests/intel/x86-64/haswell/haswell-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Haswell (Core i7)
+Core i7 (Haswell)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand avx2 bmi1 bmi2
--- a/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-5.test
+++ b/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-5.test
@ -1206,7 +1206,7 @@ performance
 1
 0
 128 (non-authoritative)
-Arrow Lake-S (Core Ultra 5)
+Core Ultra 5 (Arrow Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1240,5 +1240,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Arrow Lake-S (Core Ultra 5)
+Core Ultra 5 (Arrow Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-7.test
+++ b/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-7.test
@ -1730,7 +1730,7 @@ performance
 1
 0
 128 (non-authoritative)
-Arrow Lake-S (Core Ultra 7)
+Core Ultra 7 (Arrow Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1764,5 +1764,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Arrow Lake-S (Core Ultra 7)
+Core Ultra 7 (Arrow Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/lion-cove/lunar-lake-v-core-ultra-9.test
+++ b/tests/intel/x86-64/lion-cove/lunar-lake-v-core-ultra-9.test
@ -714,7 +714,7 @@ performance
 1
 0
 128 (non-authoritative)
-Lunar Lake-V (Core Ultra 9)
+Core Ultra 9 (Lunar Lake-V)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -748,5 +748,5 @@ low-power efficiency
 0
 0
 128 (non-authoritative)
-Lunar Lake-V (Core Ultra 9)
+Core Ultra 9 (Lunar Lake-V)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/nehalem/arrandale-core-i5.test
+++ b/tests/intel/x86-64/nehalem/arrandale-core-i5.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Arrandale (Core i5)
+Core i5 (Arrandale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd popcnt aes rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/arrandale-core-i7.test
+++ b/tests/intel/x86-64/nehalem/arrandale-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Arrandale (Core i7)
+Core i7 (Arrandale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/arrandale-pentium.test
+++ b/tests/intel/x86-64/nehalem/arrandale-pentium.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Arrandale (Pentium)
+Pentium (Arrandale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/bloomfield-core-i7.test
+++ b/tests/intel/x86-64/nehalem/bloomfield-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Bloomfield (Core i7)
+Core i7 (Bloomfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/bloomfield-xeon.test
+++ b/tests/intel/x86-64/nehalem/bloomfield-xeon.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Bloomfield (Xeon)
+Xeon (Bloomfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/gainestown-xeon.test
+++ b/tests/intel/x86-64/nehalem/gainestown-xeon.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Gainestown 8M (Xeon)
+Xeon (Gainestown)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/gulftown-core-i7.test
+++ b/tests/intel/x86-64/nehalem/gulftown-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Gulftown (Core i7)
+Core i7 Extreme (Gulftown)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/lynnfield-core-i5.test
+++ b/tests/intel/x86-64/nehalem/lynnfield-core-i5.test
@ -354,5 +354,5 @@ general
 1
 0
 128 (non-authoritative)
-Lynnfield (Core i5)
+Core i5 (Lynnfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/lynnfield-core-i7.test
+++ b/tests/intel/x86-64/nehalem/lynnfield-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Lynnfield (Core i7)
+Core i7 (Lynnfield)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/nehalem/westmere-ep-xeon.test
+++ b/tests/intel/x86-64/nehalem/westmere-ep-xeon.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Gulftown (Xeon)
+Xeon (Westmere-EP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/raptor-cove/emerald-rapids-sp-xeon-platinum.test
+++ b/tests/intel/x86-64/raptor-cove/emerald-rapids-sp-xeon-platinum.test
@ -4342,5 +4342,5 @@ general
 1
 0
 128 (non-authoritative)
-Emerald Rapids-SP (Xeon Platinum)
+Xeon Platinum (Emerald Rapids-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd sha_ni avx512bw avx512vl sgx rdseed adx avx512vnni avx512vbmi avx512vbmi2
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-h-core-i9.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-h-core-i9.test
@ -1398,7 +1398,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-H (Core i9)
+Core i9 (Raptor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1432,5 +1432,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-H (Core i9)
+Core i9 (Raptor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test
@ -1398,7 +1398,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-P (Core i7)
+Core i7 (Raptor Lake-P)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1432,5 +1432,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-P (Core i7)
+Core i7 (Raptor Lake-P)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test
@ -1398,7 +1398,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1432,5 +1432,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test
@ -1678,7 +1678,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i7)
+Core i7 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1712,5 +1712,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i7)
+Core i7 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test
@ -2206,7 +2206,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i9)
+Core i9 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -2240,5 +2240,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i9)
+Core i9 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i5.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i5.test
@ -1398,7 +1398,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1432,5 +1432,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i5)
+Core i5 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i7.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i7.test
@ -1942,7 +1942,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i7)
+Core i7 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1976,5 +1976,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i7)
+Core i7 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i9.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i9.test
@ -2206,7 +2206,7 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i9)
+Core i9 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -2240,5 +2240,5 @@ efficiency
 1
 0
 128 (non-authoritative)
-Raptor Lake-S (Core i9)
+Core i9 (Raptor Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test
+++ b/tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test
@ -310,5 +310,5 @@ performance
 1
 0
 128 (non-authoritative)
-Raptor Lake-U (Core i7)
+Core i7 (Raptor Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-5.test
+++ b/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-5.test
@ -1500,7 +1500,7 @@ performance
 1
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 5)
+Core Ultra 5 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1534,7 +1534,7 @@ efficiency
 1
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 5)
+Core Ultra 5 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1568,5 +1568,5 @@ low-power efficiency
 0
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 5)
+Core Ultra 5 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-7.test
+++ b/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-7.test
@ -1836,7 +1836,7 @@ performance
 1
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 7)
+Core Ultra 7 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1870,7 +1870,7 @@ efficiency
 1
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 7)
+Core Ultra 7 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -1904,5 +1904,5 @@ low-power efficiency
 0
 0
 128 (non-authoritative)
-Meteor Lake-H (Core Ultra 7)
+Core Ultra 7 (Meteor Lake-H)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx
--- a/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test
+++ b/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Ivy Bridge (Core i3)
+Core i3 (Ivy Bridge)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd popcnt xsave osxsave avx rdtscp lm lahf_lm constant_tsc f16c
--- a/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test
+++ b/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Ivy Bridge (Core i5)
+Core i5 (Ivy Bridge)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc f16c rdrand
--- a/tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test
+++ b/tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Ivy Bridge-E (Xeon)
+Xeon E5 (Ivy Bridge-E)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc f16c rdrand x2apic
--- a/tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test
+++ b/tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Sandy Bridge (Celeron)
+Celeron (Sandy Bridge)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt xsave rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test
+++ b/tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Sandy Bridge (Core i7)
+Core i7 (Sandy Bridge)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc
--- a/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test
+++ b/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Sandy Bridge-E (Core i7)
+Core i7 Extreme (Sandy Bridge-E)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc x2apic
--- a/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test
+++ b/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Sandy Bridge-E (Xeon)
+Xeon E5 (Sandy Bridge-E)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc x2apic
--- a/tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test
+++ b/tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test
@ -110,5 +110,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Sandy Bridge (Xeon)
+Xeon E3 (Sandy Bridge)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc x2apic
--- a/tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test
+++ b/tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test
@ -230,5 +230,5 @@ general
 1
 0
 128 (non-authoritative)
-Cannon Lake (Core i3)
+Core i3 (Cannon Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vbmi
--- a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test
+++ b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test
@ -1030,5 +1030,5 @@ general
 1
 0
 128 (non-authoritative)
-Cascade Lake-SP (Xeon Gold)
+Xeon Gold (Cascade Lake-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx avx512vnni
--- a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test
+++ b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test
@ -2774,5 +2774,5 @@ general
 1
 0
 128 (non-authoritative)
-Cascade Lake-SP (Xeon Platinum)
+Xeon Platinum (Cascade Lake-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx avx512vnni
--- a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test
+++ b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test
@ -1230,5 +1230,5 @@ general
 1
 0
 128 (non-authoritative)
-Cascade Lake-SP (Xeon Silver)
+Xeon Silver (Cascade Lake-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx avx512vnni
--- a/tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test
+++ b/tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test
@ -2830,5 +2830,5 @@ general
 1
 0
 128 (non-authoritative)
-Cascade Lake-W (Xeon W)
+Xeon W (Cascade Lake-W)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx avx512vnni
--- a/tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test
+++ b/tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test
@ -1794,5 +1794,5 @@ general
 1
 0
 128 (non-authoritative)
-Cascade Lake-X (Core i9)
+Core i9 (Cascade Lake-X)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx avx512vnni
--- a/tests/intel/x86-64/skylake/coffee-lake-core-i7.test
+++ b/tests/intel/x86-64/skylake/coffee-lake-core-i7.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Coffee Lake (Core i7)
+Core i7 (Coffee Lake-S)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm sgx rdseed adx
--- a/tests/intel/x86-64/skylake/comet-lake-core-i7-u.test
+++ b/tests/intel/x86-64/skylake/comet-lake-core-i7-u.test
@ -110,5 +110,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Comet Lake-U (Core i7)
+Core i7 (Comet Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sgx rdseed adx
--- a/tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test
+++ b/tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test
@ -382,5 +382,5 @@ general
 1
 0
 128 (non-authoritative)
-Kaby Lake-G (Core i7)
+Core i7 (Kaby Lake-G)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sgx rdseed adx
--- a/tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test
+++ b/tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Kaby Lake-U (Core i7)
+Core i7 (Kaby Lake-U)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sgx rdseed adx
--- a/tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test
+++ b/tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test
@ -110,5 +110,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Kaby Lake-R (Core i5)
+Core i5 (Kaby Lake-R)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm sgx rdseed adx
--- a/tests/intel/x86-64/skylake/skylake-core-i5.test
+++ b/tests/intel/x86-64/skylake/skylake-core-i5.test
@ -102,5 +102,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Skylake (Core i5)
+Core i5 (Skylake)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm rdseed adx
--- a/tests/intel/x86-64/skylake/skylake-de-xeon-d.test
+++ b/tests/intel/x86-64/skylake/skylake-de-xeon-d.test
@ -1630,5 +1630,5 @@ general
 1
 0
 128 (non-authoritative)
-Skylake-DE (Xeon D)
+Xeon D (Skylake-DE)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx
--- a/tests/intel/x86-64/skylake/skylake-pentium.test
+++ b/tests/intel/x86-64/skylake/skylake-pentium.test
@ -106,5 +106,5 @@ general
 -1
 -1
 128 (non-authoritative)
-Skylake (Pentium)
+Pentium (Skylake)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave rdtscp lm lahf_lm abm constant_tsc rdrand x2apic sgx rdseed
--- a/tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test
+++ b/tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test
@ -630,7 +630,7 @@ general
 1
 0
 128 (non-authoritative)
-Skylake-SP (Xeon Bronze)
+Xeon Bronze (Skylake-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx
 --------------------------------------------------------------------------------
 x86
@ -664,5 +664,5 @@ general
 1
 0
 128 (non-authoritative)
-Skylake-SP (Xeon Bronze)
+Xeon Bronze (Skylake-SP)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm avx512f avx512dq avx512cd avx512bw avx512vl rdseed adx
--- a/Show more
+++ b/Show more