diff --git a/libcpuid/cpuid_main.c b/libcpuid/cpuid_main.c
index 199c30d6..ed3db36e 100644
--- a/libcpuid/cpuid_main.c
+++ b/libcpuid/cpuid_main.c
@@ -969,6 +969,7 @@ static void load_features_common(struct cpu_raw_data_t* raw, struct cpu_id_t* da
 		{ 13, CPU_FEATURE_CX16 },
 		{ 19, CPU_FEATURE_SSE4_1 },
 		{ 20, CPU_FEATURE_SSE4_2 },
+		{ 21, CPU_FEATURE_X2APIC },
 		{ 22, CPU_FEATURE_MOVBE },
 		{ 23, CPU_FEATURE_POPCNT },
 		{ 25, CPU_FEATURE_AES },
@@ -983,9 +984,19 @@ static void load_features_common(struct cpu_raw_data_t* raw, struct cpu_id_t* da
 		{  3, CPU_FEATURE_BMI1 },
 		{  5, CPU_FEATURE_AVX2 },
 		{  8, CPU_FEATURE_BMI2 },
+		{ 16, CPU_FEATURE_AVX512F },
+		{ 17, CPU_FEATURE_AVX512DQ },
 		{ 18, CPU_FEATURE_RDSEED },
 		{ 19, CPU_FEATURE_ADX },
+		{ 28, CPU_FEATURE_AVX512CD },
 		{ 29, CPU_FEATURE_SHA_NI },
+		{ 30, CPU_FEATURE_AVX512BW },
+		{ 31, CPU_FEATURE_AVX512VL },
+	};
+	const struct feature_map_t matchtable_ecx7[] = {
+		{  1, CPU_FEATURE_AVX512VBMI },
+		{  6, CPU_FEATURE_AVX512VBMI2 },
+		{ 11, CPU_FEATURE_AVX512VNNI },
 	};
 	const struct feature_map_t matchtable_edx81[] = {
 		{ 11, CPU_FEATURE_SYSCALL },
@@ -1005,6 +1016,7 @@ static void load_features_common(struct cpu_raw_data_t* raw, struct cpu_id_t* da
 	}
 	if (raw->basic_cpuid[0][EAX] >= 7) {
 		match_features(matchtable_ebx7, COUNT_OF(matchtable_ebx7), raw->basic_cpuid[7][EBX], data);
+		match_features(matchtable_ecx7, COUNT_OF(matchtable_ecx7), raw->basic_cpuid[7][ECX], data);
 	}
 	if (raw->ext_cpuid[0][EAX] >= 0x80000001) {
 		match_features(matchtable_edx81, COUNT_OF(matchtable_edx81), raw->ext_cpuid[1][EDX], data);
diff --git a/libcpuid/recog_intel.c b/libcpuid/recog_intel.c
index c4004353..08ad4727 100644
--- a/libcpuid/recog_intel.c
+++ b/libcpuid/recog_intel.c
@@ -582,7 +582,7 @@ static void load_intel_features(struct cpu_raw_data_t* raw, struct cpu_id_t* dat
 		{ 14, CPU_FEATURE_XTPR },
 		{ 15, CPU_FEATURE_PDCM },
 		{ 18, CPU_FEATURE_DCA },
-		{ 21, CPU_FEATURE_X2APIC },
+		/* id 21 is handled in common */
 	};
 	const struct feature_map_t matchtable_edx81[] = {
 		{ 20, CPU_FEATURE_XD },
@@ -591,21 +591,12 @@ static void load_intel_features(struct cpu_raw_data_t* raw, struct cpu_id_t* dat
 		{  2, CPU_FEATURE_SGX },
 		{  4, CPU_FEATURE_HLE },
 		{ 11, CPU_FEATURE_RTM },
-		{ 16, CPU_FEATURE_AVX512F },
-		{ 17, CPU_FEATURE_AVX512DQ },
-		/* id 18 and 19 are handled in common */
+		/* id 16 to 19 are handled in common */
 		{ 26, CPU_FEATURE_AVX512PF },
 		{ 27, CPU_FEATURE_AVX512ER },
-		{ 28, CPU_FEATURE_AVX512CD },
-		/* id 29 is handled in common */
-		{ 30, CPU_FEATURE_AVX512BW },
-		{ 31, CPU_FEATURE_AVX512VL },
-	};
-	const struct feature_map_t matchtable_ecx7[] = {
-		{  1, CPU_FEATURE_AVX512VBMI },
-		{  6, CPU_FEATURE_AVX512VBMI2 },
-		{ 11, CPU_FEATURE_AVX512VNNI },
+		/* id 28 to 31 are handled in common */
 	};
+
 	if (raw->basic_cpuid[0][EAX] >= 1) {
 		match_features(matchtable_edx1, COUNT_OF(matchtable_edx1), raw->basic_cpuid[1][EDX], data);
 		match_features(matchtable_ecx1, COUNT_OF(matchtable_ecx1), raw->basic_cpuid[1][ECX], data);
@@ -616,7 +607,6 @@ static void load_intel_features(struct cpu_raw_data_t* raw, struct cpu_id_t* dat
 	// detect TSX/AVX512:
 	if (raw->basic_cpuid[0][EAX] >= 7) {
 		match_features(matchtable_ebx7, COUNT_OF(matchtable_ebx7), raw->basic_cpuid[7][EBX], data);
-		match_features(matchtable_ecx7, COUNT_OF(matchtable_ecx7), raw->basic_cpuid[7][ECX], data);
 	}
 }
 
diff --git a/tests/amd/zen2/epyc-rome-dual.test b/tests/amd/zen2/epyc-rome-dual.test
index 0d47c0b5..1a4c490b 100644
--- a/tests/amd/zen2/epyc-rome-dual.test
+++ b/tests/amd/zen2/epyc-rome-dual.test
@@ -15391,8 +15391,7 @@ general
 0
 256 (authoritative)
 EPYC (Rome)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
---------------------------------------------------------------------------------
+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
 x86
 x86-64-v3
 general
@@ -15425,4 +15424,4 @@ general
 0
 256 (authoritative)
 EPYC (Rome)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen2/epyc-rome.test b/tests/amd/zen2/epyc-rome.test
index 35f28be8..2967da8f 100644
--- a/tests/amd/zen2/epyc-rome.test
+++ b/tests/amd/zen2/epyc-rome.test
@@ -7711,4 +7711,4 @@ general
 0
 256 (authoritative)
 EPYC (Rome)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen2/ryzen3-mendocino.test b/tests/amd/zen2/ryzen3-mendocino.test
index ca70ce5c..35e13eff 100644
--- a/tests/amd/zen2/ryzen3-mendocino.test
+++ b/tests/amd/zen2/ryzen3-mendocino.test
@@ -503,4 +503,4 @@ general
 0
 256 (authoritative)
 Ryzen 3 (Mendocino)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen2/ryzen5-matisse.test b/tests/amd/zen2/ryzen5-matisse.test
index 6988b548..20e939b4 100644
--- a/tests/amd/zen2/ryzen5-matisse.test
+++ b/tests/amd/zen2/ryzen5-matisse.test
@@ -1003,4 +1003,4 @@ general
 0
 256 (authoritative)
 Ryzen 5 (Matisse)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen2/ryzen5-mendocino.test b/tests/amd/zen2/ryzen5-mendocino.test
index 6f49e25d..075456e8 100644
--- a/tests/amd/zen2/ryzen5-mendocino.test
+++ b/tests/amd/zen2/ryzen5-mendocino.test
@@ -503,4 +503,4 @@ general
 0
 256 (authoritative)
 Ryzen 5 (Mendocino)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen3/ryzen5-vermeer.test b/tests/amd/zen3/ryzen5-vermeer.test
index 87f1ccbc..3478e234 100644
--- a/tests/amd/zen3/ryzen5-vermeer.test
+++ b/tests/amd/zen3/ryzen5-vermeer.test
@@ -792,6 +792,7 @@ CPUID 80000023: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
+x86-64-v3
 general
 15
 1
@@ -822,4 +823,4 @@ general
 0
 256 (authoritative)
 Ryzen 5 (Vermeer)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen3/ryzen7-rembrandt-r.test b/tests/amd/zen3/ryzen7-rembrandt-r.test
index 58874df8..40553520 100644
--- a/tests/amd/zen3/ryzen7-rembrandt-r.test
+++ b/tests/amd/zen3/ryzen7-rembrandt-r.test
@@ -1055,4 +1055,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Rembrandt)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen3/ryzen7-rembrandt.test b/tests/amd/zen3/ryzen7-rembrandt.test
index 72cfa873..9e37c46d 100644
--- a/tests/amd/zen3/ryzen7-rembrandt.test
+++ b/tests/amd/zen3/ryzen7-rembrandt.test
@@ -1103,4 +1103,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Rembrandt)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen3/ryzen7-vermeer.test b/tests/amd/zen3/ryzen7-vermeer.test
index deccb63c..fe9eff46 100644
--- a/tests/amd/zen3/ryzen7-vermeer.test
+++ b/tests/amd/zen3/ryzen7-vermeer.test
@@ -1056,6 +1056,7 @@ CPUID 80000023: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
+x86-64-v3
 general
 15
 1
@@ -1086,4 +1087,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Vermeer)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen3/ryzen9-rembrandt.test b/tests/amd/zen3/ryzen9-rembrandt.test
index 15382ade..db21f397 100644
--- a/tests/amd/zen3/ryzen9-rembrandt.test
+++ b/tests/amd/zen3/ryzen9-rembrandt.test
@@ -1055,4 +1055,4 @@ general
 0
 256 (authoritative)
 Ryzen 9 (Rembrandt)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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
diff --git a/tests/amd/zen4/epyc-genoa.test b/tests/amd/zen4/epyc-genoa.test
index 833e1092..fe7003a9 100644
--- a/tests/amd/zen4/epyc-genoa.test
+++ b/tests/amd/zen4/epyc-genoa.test
@@ -2560,7 +2560,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 1
@@ -2591,4 +2591,4 @@ general
 0
 256 (authoritative)
 EPYC (Genoa)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen-z1-phoenix.test b/tests/amd/zen4/ryzen-z1-phoenix.test
index c781b918..70869fa6 100644
--- a/tests/amd/zen4/ryzen-z1-phoenix.test
+++ b/tests/amd/zen4/ryzen-z1-phoenix.test
@@ -972,7 +972,7 @@ CPUID 80000027: 00000000-00000000-00000000-00000000
 CPUID 80000028: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 8
@@ -1003,4 +1003,4 @@ general
 0
 256 (authoritative)
 Ryzen Z1 (Phoenix)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen5-raphael.test b/tests/amd/zen4/ryzen5-raphael.test
index 8bbb2cbe..c9f101c5 100644
--- a/tests/amd/zen4/ryzen5-raphael.test
+++ b/tests/amd/zen4/ryzen5-raphael.test
@@ -948,7 +948,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 1
@@ -979,4 +979,4 @@ general
 0
 256 (authoritative)
 Ryzen 5 (Raphael)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen7-hawk-point.test b/tests/amd/zen4/ryzen7-hawk-point.test
index 4bd3adaf..8ba5983b 100644
--- a/tests/amd/zen4/ryzen7-hawk-point.test
+++ b/tests/amd/zen4/ryzen7-hawk-point.test
@@ -1296,7 +1296,7 @@ amd_fn8000001dh[2]=00004143 01c0003f 000007ff 00000002
 amd_fn8000001dh[3]=0003c163 03c0003f 00003fff 00000001
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 5
@@ -1327,4 +1327,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Hawk Point)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen7-phoenix-g.test b/tests/amd/zen4/ryzen7-phoenix-g.test
index a6f4190a..e57a5187 100644
--- a/tests/amd/zen4/ryzen7-phoenix-g.test
+++ b/tests/amd/zen4/ryzen7-phoenix-g.test
@@ -1264,7 +1264,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 5
@@ -1295,4 +1295,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Phoenix)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 cpb aperfmperf avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen7-raphael.test b/tests/amd/zen4/ryzen7-raphael.test
index ad5bed3e..70a6fd40 100644
--- a/tests/amd/zen4/ryzen7-raphael.test
+++ b/tests/amd/zen4/ryzen7-raphael.test
@@ -1280,6 +1280,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
+x86-64-v4
 general
 15
 1
@@ -1310,4 +1311,4 @@ general
 0
 256 (authoritative)
 Ryzen 7 (Raphael)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 cpb aperfmperf avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen9-phoenix-h.test b/tests/amd/zen4/ryzen9-phoenix-h.test
index 05efc244..51da6fd0 100644
--- a/tests/amd/zen4/ryzen9-phoenix-h.test
+++ b/tests/amd/zen4/ryzen9-phoenix-h.test
@@ -1280,7 +1280,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 performance
 15
 4
@@ -1311,4 +1311,4 @@ performance
 0
 256 (authoritative)
 Ryzen 9 (Phoenix)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/ryzen9-raphael.test b/tests/amd/zen4/ryzen9-raphael.test
index eb6eba80..150d08e1 100644
--- a/tests/amd/zen4/ryzen9-raphael.test
+++ b/tests/amd/zen4/ryzen9-raphael.test
@@ -1896,7 +1896,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 1
@@ -1927,4 +1927,4 @@ general
 0
 256 (authoritative)
 Ryzen 9 (Raphael)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen4/threadripper-pro-storm-peak.test b/tests/amd/zen4/threadripper-pro-storm-peak.test
index 695ffd13..107f89ed 100644
--- a/tests/amd/zen4/threadripper-pro-storm-peak.test
+++ b/tests/amd/zen4/threadripper-pro-storm-peak.test
@@ -15360,7 +15360,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
-x86-64-v3
+x86-64-v4
 general
 15
 8
@@ -15391,4 +15391,4 @@ general
 0
 256 (authoritative)
 Threadripper (Storm Peak)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen5/ryzen7-granite-ridge.test b/tests/amd/zen5/ryzen7-granite-ridge.test
index 41cabf49..121ad83d 100644
--- a/tests/amd/zen5/ryzen7-granite-ridge.test
+++ b/tests/amd/zen5/ryzen7-granite-ridge.test
@@ -1296,6 +1296,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
+x86-64-v4
 general
 15
 4
@@ -1326,4 +1327,4 @@ general
 0
 64 (authoritative)
 Ryzen 7 (Granite Ridge)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 cpb aperfmperf avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/amd/zen5/ryzen9-granite-ridge.test b/tests/amd/zen5/ryzen9-granite-ridge.test
index 0e4f9673..bfca8287 100644
--- a/tests/amd/zen5/ryzen9-granite-ridge.test
+++ b/tests/amd/zen5/ryzen9-granite-ridge.test
@@ -2592,6 +2592,7 @@ CPUID 80000028: 00000000-00000000-00000000-00000000
 CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000
 --------------------------------------------------------------------------------
 x86
+x86-64-v4
 general
 15
 4
@@ -2622,4 +2623,4 @@ general
 0
 64 (authoritative)
 Ryzen 9 (Granite Ridge)
-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 cpb aperfmperf avx2 bmi1 bmi2 sha_ni rdseed adx
+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 cpb aperfmperf avx2 bmi1 bmi2 avx512f avx512dq avx512cd sha_ni avx512bw avx512vl rdseed adx avx512vnni avx512vbmi avx512vbmi2
diff --git a/tests/create_test.py b/tests/create_test.py
index f6260a56..f1caafcf 100755
--- a/tests/create_test.py
+++ b/tests/create_test.py
@@ -58,6 +58,8 @@ def readResultFile():
 			repdata.append(delimiter)
 		if field == "arch":
 			value = s[s.find(":") + 2:]
+		if field == "feat_level":
+			value = s[s.find(":") + 2:]
 			repdata.append(value)
 		if field == "purpose":
 			value = s[s.find(":") + 2:]
diff --git a/tests/via/isaiah/eden-x4.test b/tests/via/isaiah/eden-x4.test
index 52a32a71..97564725 100644
--- a/tests/via/isaiah/eden-x4.test
+++ b/tests/via/isaiah/eden-x4.test
@@ -167,4 +167,4 @@ general
 -1
 -1 (non-authoritative)
 VIA Eden X4 (Isaiah)
-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 avx rdtscp lm lahf_lm abm f16c rdrand avx2 bmi1 bmi2 rdseed adx
+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 avx rdtscp lm lahf_lm abm f16c rdrand x2apic avx2 bmi1 bmi2 rdseed adx
diff --git a/tests/via/samuel/cyrix-iii.test b/tests/via/samuel/cyrix-iii.test
index 316306ba..17ebd4de 100644
--- a/tests/via/samuel/cyrix-iii.test
+++ b/tests/via/samuel/cyrix-iii.test
@@ -40,4 +40,4 @@ general
 -1
 -1 (non-authoritative)
 VIA Cyrix III (Samuel)
-fpu de tsc msr mce cx8 mtrr pge mmx monitor ssse3 sse4_2 movbe fma3 rdrand hypervisor
+fpu de tsc msr mce cx8 mtrr pge mmx monitor ssse3 sse4_2 movbe fma3 rdrand x2apic hypervisor
diff --git a/tests/zhaoxin/yongfeng/kaisheng-hk-40000.test b/tests/zhaoxin/yongfeng/kaisheng-hk-40000.test
index a58dacbc..2f12bc64 100644
--- a/tests/zhaoxin/yongfeng/kaisheng-hk-40000.test
+++ b/tests/zhaoxin/yongfeng/kaisheng-hk-40000.test
@@ -991,4 +991,4 @@ general
 -1
 -1 (non-authoritative)
 Zhaoxin KaisHeng (Yongfeng)
-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 ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand avx2 bmi1 bmi2 sha_ni rdseed adx
+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 ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm abm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 sha_ni rdseed adx