[PATCH v3 11/12] cpu_map: Add versioned Intel SapphireRapids CPUs

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com&gt; --- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 + 9 files changed, 133 insertions(+) create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 449abbd8f3..9b3719c5ef 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -71,6 +71,7 @@ <include filename='x86_Snowridge-v3.xml'/> <include filename='x86_Snowridge-v4.xml'/> <include filename='x86_SapphireRapids.xml'/> + <include filename='x86_SapphireRapids-v2.xml'/> <!-- AMD CPUs --> <include filename='x86_athlon.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 073fd66bec..4b2a90fd74 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -87,6 +87,7 @@ cpumap_data = [ 'x86_qemu64.xml', 'x86_SandyBridge-IBRS.xml', 'x86_SandyBridge.xml', + 'x86_SapphireRapids-v2.xml', 'x86_SapphireRapids.xml', 'x86_Skylake-Client-IBRS.xml', 'x86_Skylake-Client-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_SapphireRapids-v2.xml b/src/cpu_map/x86_SapphireRapids-v2.xml new file mode 100644 index 0000000000..0d90d50f5f --- /dev/null +++ b/src/cpu_map/x86_SapphireRapids-v2.xml @@ -0,0 +1,125 @@ +<!-- extra info from qemu: + 'model.level': '0x20' + 'model.stepping': '4' + 'model.xlevel': '0x80000008' + 'model.model_id': 'Intel Xeon Processor (SapphireRapids)' +--> +<cpus> + <model name='SapphireRapids-v2'> + <decode host='on' guest='on'/> + <signature family='6' model='143'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amx-bf16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx-vnni'/> + <feature name='avx2'/> + <feature name='avx512-bf16'/> + <feature name='avx512-fp16'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512ifma'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='bus-lock-detect'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fbsdp-no'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fxsr'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mds-no'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pschange-mc-no'/> + <feature name='psdp-no'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='sep'/> + <feature name='serialize'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='taa-no'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xfd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index c80455a6b5..4067720049 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -98,6 +98,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='yes' vendor='Intel'>SandyBridge</model> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index ee67181b3e..7c836af7e6 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -99,6 +99,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='no' vendor='Intel'>SandyBridge</model> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 00b6d45314..6ff2ebbde8 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -97,6 +97,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='yes' vendor='Intel'>SandyBridge</model> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index 4aebd4a128..8e504436cf 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -99,6 +99,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='yes' vendor='Intel'>SandyBridge</model> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index c9fc385bfa..7f0b057d97 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -98,6 +98,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='no' vendor='Intel'>SandyBridge</model> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 0e424db1d8..0f43f5b543 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -98,6 +98,7 @@ <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel'>SapphireRapids-v2</model> <model usable='no' vendor='Intel'>SapphireRapids</model> <model usable='no' vendor='Intel'>SandyBridge-IBRS</model> <model usable='yes' vendor='Intel'>SandyBridge</model> -- 2.41.0