@samitouri / QOSamiQemu / commits / 1ad6644875

i386/cpu: Rename AMX mirror cpuid macros with _ALIAS suffix

For the similar case - CPUID_EXT2_AMD_ALIASES, the term "alias" has already been used. Therefore, reintroducing the new term "mirror" is likely to cause confusion. Rename the relevant CPUID macros of AMX with _ALIAS suffix, aligning with KVM's naming convention. Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Link: https://lore.kernel.org/r/20260310140819.1563084-2-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Zhao Liu committed Mar 10, 2026 at 22:08 UTC 1ad6644875724909323f97bd3da5d93c175c6f64
2 files changed +11 -11
target/i386/cpu.c
+3 -3
@@ -5550,9 +5550,9 @@ static const X86CPUDefinition builtin_x86_defs[] = {
5550 CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
5551 CPUID_XSAVE_XGETBV1 | CPUID_XSAVE_XSAVES | CPUID_D_1_EAX_XFD,
5552 .features[FEAT_1E_1_EAX] =
5553 - CPUID_1E_1_EAX_AMX_INT8_MIRROR | CPUID_1E_1_EAX_AMX_BF16_MIRROR |
5554 - CPUID_1E_1_EAX_AMX_COMPLEX_MIRROR |
5555 - CPUID_1E_1_EAX_AMX_FP16_MIRROR | CPUID_1E_1_EAX_AMX_FP8 |
5553 + CPUID_1E_1_EAX_AMX_INT8_ALIAS | CPUID_1E_1_EAX_AMX_BF16_ALIAS |
5554 + CPUID_1E_1_EAX_AMX_COMPLEX_ALIAS |
5555 + CPUID_1E_1_EAX_AMX_FP16_ALIAS | CPUID_1E_1_EAX_AMX_FP8 |
5556 CPUID_1E_1_EAX_AMX_TF32 | CPUID_1E_1_EAX_AMX_AVX512 |
5557 CPUID_1E_1_EAX_AMX_MOVRS,
5558 .features[FEAT_29_0_EBX] = CPUID_29_0_EBX_APX_NCI_NDD_NF,
target/i386/cpu.h
+8 -8
@@ -1098,14 +1098,14 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w);
1098 /* Packets which contain IP payload have LIP values */
1099 #define CPUID_14_0_ECX_LIP (1U << 31)
1100
1101 -/* AMX_INT8 instruction (mirror of CPUID_7_0_EDX_AMX_INT8) */
1102 -#define CPUID_1E_1_EAX_AMX_INT8_MIRROR (1U << 0)
1103 -/* AMX_BF16 instruction (mirror of CPUID_7_0_EDX_AMX_BF16) */
1104 -#define CPUID_1E_1_EAX_AMX_BF16_MIRROR (1U << 1)
1105 -/* AMX_COMPLEX instruction (mirror of CPUID_7_1_EDX_AMX_COMPLEX) */
1106 -#define CPUID_1E_1_EAX_AMX_COMPLEX_MIRROR (1U << 2)
1107 -/* AMX_FP16 instruction (mirror of CPUID_7_1_EAX_AMX_FP16) */
1108 -#define CPUID_1E_1_EAX_AMX_FP16_MIRROR (1U << 3)
1101 +/* AMX_INT8 instruction (alias of CPUID_7_0_EDX_AMX_INT8) */
1102 +#define CPUID_1E_1_EAX_AMX_INT8_ALIAS (1U << 0)
1103 +/* AMX_BF16 instruction (alias of CPUID_7_0_EDX_AMX_BF16) */
1104 +#define CPUID_1E_1_EAX_AMX_BF16_ALIAS (1U << 1)
1105 +/* AMX_COMPLEX instruction (alias of CPUID_7_1_EDX_AMX_COMPLEX) */
1106 +#define CPUID_1E_1_EAX_AMX_COMPLEX_ALIAS (1U << 2)
1107 +/* AMX_FP16 instruction (alias of CPUID_7_1_EAX_AMX_FP16) */
1108 +#define CPUID_1E_1_EAX_AMX_FP16_ALIAS (1U << 3)
1109 /* AMX_FP8 instruction */
1110 #define CPUID_1E_1_EAX_AMX_FP8 (1U << 4)
1111 /* AMX_TF32 instruction */