From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: tao1.su@linux.intel.com, zhao1.liu@intel.com,
xiaoyao.li@intel.com, Xuelian Guo <xuelian.guo@intel.com>
Subject: [PATCH 6/8] target/i386: Add feature dependencies for AVX10
Date: Tue, 29 Oct 2024 16:18:56 +0100 [thread overview]
Message-ID: <20241029151858.550269-7-pbonzini@redhat.com> (raw)
In-Reply-To: <20241029151858.550269-1-pbonzini@redhat.com>
From: Tao Su <tao1.su@linux.intel.com>
Since the highest supported vector length for a processor implies that
all lesser vector lengths are also supported, add the dependencies of
the supported vector lengths. If all vector lengths aren't supported,
clear AVX10 enable bit as well.
Note that the order of AVX10 related dependencies should be kept as:
CPUID_24_0_EBX_AVX10_128 -> CPUID_24_0_EBX_AVX10_256,
CPUID_24_0_EBX_AVX10_256 -> CPUID_24_0_EBX_AVX10_512,
CPUID_24_0_EBX_AVX10_VL_MASK -> CPUID_7_1_EDX_AVX10,
CPUID_7_1_EDX_AVX10 -> CPUID_24_0_EBX,
so that prevent user from setting weird CPUID combinations, e.g. 256-bits
and 512-bits are supported but 128-bits is not, no vector lengths are
supported but AVX10 enable bit is still set.
Since AVX10_128 will be reserved as 1, adding these dependencies has the
bonus that when user sets -cpu host,-avx10-128, CPUID_7_1_EDX_AVX10 and
CPUID_24_0_EBX will be disabled automatically.
Tested-by: Xuelian Guo <xuelian.guo@intel.com>
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
Link: https://lore.kernel.org/r/20241028024512.156724-5-tao1.su@linux.intel.com
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/cpu.h | 4 ++++
target/i386/cpu.c | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index f8f97fe9330..59959b8b7a4 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1000,6 +1000,10 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w);
#define CPUID_24_0_EBX_AVX10_256 (1U << 17)
/* AVX10 512-bit vector support is present */
#define CPUID_24_0_EBX_AVX10_512 (1U << 18)
+/* AVX10 vector length support mask */
+#define CPUID_24_0_EBX_AVX10_VL_MASK (CPUID_24_0_EBX_AVX10_128 | \
+ CPUID_24_0_EBX_AVX10_256 | \
+ CPUID_24_0_EBX_AVX10_512)
/* RAS Features */
#define CPUID_8000_0007_EBX_OVERFLOW_RECOV (1U << 0)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 3f7fed8e485..4c86a49ad05 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1787,6 +1787,22 @@ static FeatureDep feature_dependencies[] = {
.from = { FEAT_7_0_EBX, CPUID_7_0_EBX_SGX },
.to = { FEAT_SGX_12_1_EAX, ~0ull },
},
+ {
+ .from = { FEAT_24_0_EBX, CPUID_24_0_EBX_AVX10_128 },
+ .to = { FEAT_24_0_EBX, CPUID_24_0_EBX_AVX10_256 },
+ },
+ {
+ .from = { FEAT_24_0_EBX, CPUID_24_0_EBX_AVX10_256 },
+ .to = { FEAT_24_0_EBX, CPUID_24_0_EBX_AVX10_512 },
+ },
+ {
+ .from = { FEAT_24_0_EBX, CPUID_24_0_EBX_AVX10_VL_MASK },
+ .to = { FEAT_7_1_EDX, CPUID_7_1_EDX_AVX10 },
+ },
+ {
+ .from = { FEAT_7_1_EDX, CPUID_7_1_EDX_AVX10 },
+ .to = { FEAT_24_0_EBX, ~0ull },
+ },
};
typedef struct X86RegisterInfo32 {
--
2.47.0
next prev parent reply other threads:[~2024-10-29 15:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 15:18 [PATCH v2 0/8] Add AVX10.1 CPUID support and GraniteRapids-v2 model Paolo Bonzini
2024-10-29 15:18 ` [PATCH 1/8] target/i386: cpu: set correct supported XCR0 features for TCG Paolo Bonzini
2024-10-30 2:56 ` Zhao Liu
2024-10-29 15:18 ` [PATCH 2/8] target/i386: do not rely on ExtSaveArea for accelerator-supported XCR0 bits Paolo Bonzini
2024-10-30 3:50 ` Zhao Liu
2024-10-29 15:18 ` [PATCH 3/8] target/i386: return bool from x86_cpu_filter_features Paolo Bonzini
2024-10-30 5:19 ` Zhao Liu
2024-10-29 15:18 ` [PATCH 4/8] target/i386: add AVX10 feature and AVX10 version property Paolo Bonzini
2024-10-30 3:05 ` Tao Su
2024-10-30 8:09 ` Zhao Liu
2024-10-30 8:44 ` Zhao Liu
2024-10-30 9:37 ` Tao Su
2024-10-30 13:21 ` Zhao Liu
2024-10-30 14:05 ` Tao Su
2024-10-30 15:55 ` Zhao Liu
2024-10-31 4:39 ` Tao Su
2024-10-31 5:52 ` Xiaoyao Li
2024-10-31 6:07 ` Tao Su
2024-10-31 7:12 ` Zhao Liu
2024-10-31 7:18 ` Zhao Liu
2024-10-31 7:19 ` Tao Su
2024-10-29 15:18 ` [PATCH 5/8] target/i386: add CPUID.24 features for AVX10 Paolo Bonzini
2024-10-30 8:50 ` Zhao Liu
2024-10-29 15:18 ` Paolo Bonzini [this message]
2024-10-29 15:18 ` [PATCH 7/8] target/i386: Add AVX512 state when AVX10 is supported Paolo Bonzini
2024-10-29 20:11 ` Paolo Bonzini
2024-10-30 8:54 ` Zhao Liu
2024-10-29 15:18 ` [PATCH 8/8] target/i386: Introduce GraniteRapids-v2 model Paolo Bonzini
2024-10-30 3:18 ` [PATCH v2 0/8] Add AVX10.1 CPUID support and " Tao Su
2024-10-30 8:35 ` Paolo Bonzini
2024-10-30 8:52 ` Tao Su
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241029151858.550269-7-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=tao1.su@linux.intel.com \
--cc=xiaoyao.li@intel.com \
--cc=xuelian.guo@intel.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).