Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx> --- src/cpu_map/x86_features.xml | 40 +++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index f53ec0d835..33e24f145f 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -5,7 +5,7 @@ --> <cpus> - <!-- standard features, ECX --> + <!-- cpuid level 0x00000001 (ecx) --> <feature name='pni'> <alias name='sse3' source='qemu'/> <cpuid eax_in='0x00000001' ecx='0x00000001'/> @@ -104,7 +104,7 @@ <cpuid eax_in='0x00000001' ecx='0x80000000'/> </feature> - <!-- standard features, EDX --> + <!-- cpuid level 0x00000001 (edx) --> <feature name='fpu'> <cpuid eax_in='0x00000001' edx='0x00000001'/> </feature> @@ -196,12 +196,12 @@ <cpuid eax_in='0x00000001' edx='0x80000000'/> </feature> - <!-- Termal Power and Management --> + <!-- cpuid level 0x00000006 (eax) --> <feature name='arat'> <cpuid eax_in='0x00000006' eax='0x00000004'/> </feature> - <!-- cpuid function 0x7 ecx 0x0 features --> + <!-- cpuid level 0x00000007, ecx 0x0000 (ebx) --> <feature name='fsgsbase'> <cpuid eax_in='0x00000007' ecx_in='0x00000000' ebx='0x00000001'/> </feature> @@ -292,6 +292,7 @@ <cpuid eax_in='0x00000007' ecx_in='0x00000000' ebx='0x80000000'/> </feature> + <!-- cpuid level 0x00000007, ecx 0x0000 (ecx) --> <feature name='avx512vbmi'> <cpuid eax_in='0x00000007' ecx_in='0x00000000' ecx='0x00000002'/> </feature> @@ -353,6 +354,7 @@ <cpuid eax_in='0x00000007' ecx_in='0x00000000' ecx='0x80000000'/> </feature> + <!-- cpuid level 0x00000007, ecx 0x0000 (edx) --> <feature name='avx512-4vnniw'> <cpuid eax_in='0x00000007' ecx_in='0x00000000' edx='0x00000004'/> </feature> @@ -413,6 +415,7 @@ <cpuid eax_in='0x00000007' ecx_in='0x00000000' edx='0x80000000'/> </feature> + <!-- cpuid level 0x00000007, ecx 0x0001 (eax) --> <feature name='avx-vnni'> <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00000010'/> </feature> @@ -438,6 +441,7 @@ <cpuid eax_in='0x00000007' ecx_in='0x00000001' eax='0x00800000'/> </feature> + <!-- cpuid level 0x00000007, ecx 0x0001 (edx) --> <feature name='avx-vnni-int8'> <cpuid eax_in='0x00000007' ecx_in='0x00000001' edx='0x00000010'/> </feature> @@ -448,11 +452,12 @@ <cpuid eax_in='0x00000007' ecx_in='0x00000001' edx='0x00004000'/> </feature> + <!-- cpuid level 0x00000007, ecx 0x0002 (edx) --> <feature name='mcdt-no'> <cpuid eax_in='0x00000007' ecx_in='0x00000002' edx='0x00000020'/> </feature> - <!-- Processor Extended State Enumeration sub leaf 1 --> + <!-- cpuid level 0x0000000d, ecx 0x0001 (eax) --> <feature name='xsaveopt'> <cpuid eax_in='0x0000000d' ecx_in='0x00000001' eax='0x00000001'/> </feature> @@ -469,7 +474,7 @@ <cpuid eax_in='0x0000000d' ecx_in='0x00000001' eax='0x00000010'/> </feature> - <!-- cpuid level 0x0000000f:1 (edx) --> + <!-- cpuid level 0x0000000f, ecx 0x0001 (edx) --> <feature name='mbm_total'> <cpuid eax_in='0x0000000f' ecx_in='0x00000001' edx='0x00000002'/> </feature> @@ -477,7 +482,7 @@ <cpuid eax_in='0x0000000f' ecx_in='0x00000001' edx='0x00000004'/> </feature> - <!-- cpuid level 0x00000012 ecx 0x0 features --> + <!-- cpuid level 0x00000012, ecx 0x0000 (eax) --> <feature name='sgx1'> <cpuid eax_in='0x00000012' ecx_in='0x00000000' eax='0x00000001'/> </feature> @@ -488,11 +493,12 @@ <cpuid eax_in='0x00000012' ecx_in='0x00000000' eax='0x00000800'/> </feature> + <!-- cpuid level 0x00000012, ecx 0x0000 (ebx) --> <feature name='sgx-exinfo'> <cpuid eax_in='0x00000012' ecx_in='0x00000000' ebx='0x00000001'/> </feature> - <!-- cpuid level 0x00000012 ecx 0x1 features --> + <!-- cpuid level 0x00000012, ecx 0x0001 (eax) --> <feature name='sgx-debug'> <cpuid eax_in='0x00000012' ecx_in='0x00000001' eax='0x00000002'/> </feature> @@ -512,12 +518,12 @@ <cpuid eax_in='0x00000012' ecx_in='0x00000001' eax='0x00000400'/> </feature> - <!-- cpuid level 0x00000014 ecx 0x0 features --> + <!-- cpuid level 0x00000014, ecx 0x0000 (ecx) --> <feature name='intel-pt-lip'> <cpuid eax_in='0x00000014' ecx_in='0x00000000' ecx='0x80000000'/> </feature> - <!-- extended features, ECX --> + <!-- cpuid level 0x80000001 (ecx) --> <feature name='lahf_lm'> <alias name='lahf-lm' source='qemu'/> <cpuid eax_in='0x80000001' ecx='0x00000001'/> @@ -593,7 +599,7 @@ <cpuid eax_in='0x80000001' ecx='0x01000000'/> </feature> - <!-- extended features, EDX --> + <!-- cpuid level 0x80000001 (edx) --> <feature name='syscall'> <cpuid eax_in='0x80000001' edx='0x00000800'/> </feature> @@ -626,12 +632,12 @@ <cpuid eax_in='0x80000001' edx='0x80000000'/> </feature> - <!-- Advanced Power Management edx features --> + <!-- cpuid level 0x80000007 (edx) --> <feature name='invtsc' migratable='no'> <cpuid eax_in='0x80000007' edx='0x00000100'/> </feature> - <!-- More AMD-specific features --> + <!-- cpuid level 0x80000008 (ebx) --> <feature name='clzero'> <cpuid eax_in='0x80000008' ebx='0x00000001'/> </feature> @@ -666,7 +672,7 @@ <cpuid eax_in='0x80000008' ebx='0x10000000'/> </feature> - <!-- SVM features --> + <!-- cpuid level 0x8000000a (edx) --> <feature name='npt'> <cpuid eax_in='0x8000000a' edx='0x00000001'/> </feature> @@ -718,7 +724,7 @@ <cpuid eax_in='0x8000000a' edx='0x10000000'/> </feature> - <!-- cpuid level 0x80000021 ecx 0x0 features --> + <!-- cpuid level 0x80000021 (eax) --> <feature name='no-nested-data-bp'> <cpuid eax_in='0x80000021' eax='0x00000001'/> </feature> @@ -732,12 +738,12 @@ <cpuid eax_in='0x80000021' eax='0x00000100'/> </feature> - <!-- IA32_CORE_CAPABILITIES features --> + <!-- msr 0x000000cf --> <feature name='split-lock-detect'> <msr index='0x000000cf' edx='0x00000000' eax='0x00000020'/> </feature> - <!-- IA32_ARCH_CAPABILITIES features --> + <!-- msr 0x0000010a --> <feature name='rdctl-no'> <msr index='0x0000010a' edx='0x00000000' eax='0x00000001'/> </feature> -- 2.39.2