From: Zhao Liu <[email protected]> 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> --- target/i386/cpu.h | 16 ++++++++-------- target/i386/cpu.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 5a62aa61579..7bd38f0c039 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1098,14 +1098,14 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w); /* Packets which contain IP payload have LIP values */ #define CPUID_14_0_ECX_LIP (1U << 31) -/* AMX_INT8 instruction (mirror of CPUID_7_0_EDX_AMX_INT8) */ -#define CPUID_1E_1_EAX_AMX_INT8_MIRROR (1U << 0) -/* AMX_BF16 instruction (mirror of CPUID_7_0_EDX_AMX_BF16) */ -#define CPUID_1E_1_EAX_AMX_BF16_MIRROR (1U << 1) -/* AMX_COMPLEX instruction (mirror of CPUID_7_1_EDX_AMX_COMPLEX) */ -#define CPUID_1E_1_EAX_AMX_COMPLEX_MIRROR (1U << 2) -/* AMX_FP16 instruction (mirror of CPUID_7_1_EAX_AMX_FP16) */ -#define CPUID_1E_1_EAX_AMX_FP16_MIRROR (1U << 3) +/* AMX_INT8 instruction (alias of CPUID_7_0_EDX_AMX_INT8) */ +#define CPUID_1E_1_EAX_AMX_INT8_ALIAS (1U << 0) +/* AMX_BF16 instruction (alias of CPUID_7_0_EDX_AMX_BF16) */ +#define CPUID_1E_1_EAX_AMX_BF16_ALIAS (1U << 1) +/* AMX_COMPLEX instruction (alias of CPUID_7_1_EDX_AMX_COMPLEX) */ +#define CPUID_1E_1_EAX_AMX_COMPLEX_ALIAS (1U << 2) +/* AMX_FP16 instruction (alias of CPUID_7_1_EAX_AMX_FP16) */ +#define CPUID_1E_1_EAX_AMX_FP16_ALIAS (1U << 3) /* AMX_FP8 instruction */ #define CPUID_1E_1_EAX_AMX_FP8 (1U << 4) /* AMX_TF32 instruction */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0a29ff805fa..e35701b93ba 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5550,9 +5550,9 @@ static const X86CPUDefinition builtin_x86_defs[] = { CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | CPUID_XSAVE_XGETBV1 | CPUID_XSAVE_XSAVES | CPUID_D_1_EAX_XFD, .features[FEAT_1E_1_EAX] = - CPUID_1E_1_EAX_AMX_INT8_MIRROR | CPUID_1E_1_EAX_AMX_BF16_MIRROR | - CPUID_1E_1_EAX_AMX_COMPLEX_MIRROR | - CPUID_1E_1_EAX_AMX_FP16_MIRROR | CPUID_1E_1_EAX_AMX_FP8 | + CPUID_1E_1_EAX_AMX_INT8_ALIAS | CPUID_1E_1_EAX_AMX_BF16_ALIAS | + CPUID_1E_1_EAX_AMX_COMPLEX_ALIAS | + CPUID_1E_1_EAX_AMX_FP16_ALIAS | CPUID_1E_1_EAX_AMX_FP8 | CPUID_1E_1_EAX_AMX_TF32 | CPUID_1E_1_EAX_AMX_AVX512 | CPUID_1E_1_EAX_AMX_MOVRS, .features[FEAT_29_0_EBX] = CPUID_29_0_EBX_APX_NCI_NDD_NF, -- 2.53.0
