proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-02 15:18:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpuconfig: add new x86-64-vX models

Browse Source 
https://gitlab.com/x86-psABIs/x86-64-ABI/
https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg01592.html
"
In 2020, AMD, Intel, Red Hat, and SUSE worked together to define
three microarchitecture levels on top of the historical x86-64
baseline:

  * x86-64:    original x86_64 baseline instruction set
  * x86-64-v2: vector instructions up to Streaming SIMD
               Extensions 4.2 (SSE4.2)  and Supplemental
               Streaming SIMD Extensions 3 (SSSE3), the
               POPCNT instruction, and CMPXCHG16B
  * x86-64-v3: vector instructions up to AVX2, MOVBE,
               and additional bit-manipulation instructions.
  * x86-64-v4: vector instructions from some of the
               AVX-512 variants.
"

This patch add new builtin model derivated from qemu64 model,
to be compatible between intel/amd.

mandatory flags from qemu-doc generator:
https://gitlab.com/qemu/qemu/-/blob/master/scripts/cpu-x86-uarch-abi.py

levels = [
    [ # x86-64 baseline
        "cmov",
        "cx8",
        "fpu",
        "fxsr",
        "mmx",
        "syscall",
        "sse",
        "sse2",
    ],
    [ # x86-64-v2
        "cx16",
        "lahf-lm",
        "popcnt",
        "pni",
        "sse4.1",
        "sse4.2",
        "ssse3",
    ],
    [ # x86-64-v3
        "avx",
        "avx2",
        "bmi1",
        "bmi2",
        "f16c",
        "fma",
        "abm",
        "movbe",
	"xsave"  #missing from qemu doc currently
    ],
    [ # x86-64-v4
        "avx512f",
        "avx512bw",
        "avx512cd",
        "avx512dq",
        "avx512vl",
    ],
]

x86-64-v1 : I'm skipping it, as it's basicaly qemu64|kvm64 -vme,-cx16 for compat Opteron_G1 from 2004
            so will use it as qemu64|kvm64 is higher are not working on opteron_g1 anyway

x86-64-v2 : Derived from qemu, +popcnt;+pni;+sse4.1;+sse4.2;+ssse3

min intel: Nehalem
min amd : Opteron_G3

x86-64-v2-AES : Derived from qemu, +aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3

min intel: Westmere
min amd : Opteron_G3

x86-64-v3 : Derived from qemu64 +aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe+xsave

min intel: Haswell
min amd : EPYC_v1

x86-64-v4 : Derived from qemu64 +aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave;+avx512f;+avx512bw;+avx512cd;+avx512dq;+avx512vl

min intel: Skylake
min amd : EPYC_v4

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-06-08 11:51:05 +02:00 committed by Fiona Ebner
parent 60302a968a
commit 1359e23fb4
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PVE/QemuServer/CPUConfig.pm
View File

@ -31,6 +31,26 @@ sub load_custom_model_conf {
return cfs_read_file($default_filename);
}
#builtin models : reported-model is mandatory
my $builtin_models = {
'x86-64-v2' => {
'reported-model' => 'qemu64',
flags => "+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
},
'x86-64-v2-AES' => {
'reported-model' => 'qemu64',
flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
},
'x86-64-v3' => {
'reported-model' => 'qemu64',
flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave",
},
'x86-64-v4' => {
'reported-model' => 'qemu64',
flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave;+avx512f;+avx512bw;+avx512cd;+avx512dq;+avx512vl",
},
};
my $depreacated_cpu_map = {
# there never was such a client CPU, so map it to the server one for backward compat
'Icelake-Client' => 'Icelake-Server',
@ -212,7 +232,7 @@ sub validate_vm_cpu_conf {
get_custom_model($cputype);
} else {
die "Built-in cputype '$cputype' is not defined (missing 'custom-' prefix?)\n"
if !defined($cpu_vendor_list->{$cputype});
if !defined($cpu_vendor_list->{$cputype}) && !defined($builtin_models->{$cputype});
}
# in a VM-specific config, certain properties are limited/forbidden
@ -302,6 +322,16 @@ sub get_cpu_models {
};
}
for my $model (keys %{$builtin_models}) {
my $reported_model = $builtin_models->{$model}->{'reported-model'};
my $vendor = $cpu_vendor_list->{$reported_model};
push @$models, {
name => $model,
custom => 0,
vendor => $vendor,
};
}
return $models if !$include_custom;
my $conf = load_custom_model_conf();
@ -359,7 +389,9 @@ sub print_cpu_device {
or die "Cannot parse cpu description: $cputype\n";
$cpu = $cpuconf->{cputype};
if (is_custom_model($cpu)) {
if (my $model = $builtin_models->{$cpu}) {
$cpu = $model->{'reported-model'};
} elsif (is_custom_model($cputype)) {
my $custom_cpu = get_custom_model($cpu);
$cpu = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
@ -468,14 +500,17 @@ sub get_cpu_options {
my $cpu = {};
my $custom_cpu;
my $builtin_cpu;
my $hv_vendor_id;
if (my $cpu_prop_str = $conf->{cpu}) {
$cpu = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cpu_prop_str)
or die "Cannot parse cpu description: $cpu_prop_str\n";
$cputype = $cpu->{cputype};
if (is_custom_model($cputype)) {
if (my $model = $builtin_models->{$cputype}) {
$cputype = $model->{'reported-model'};
$builtin_cpu->{flags} = $model->{'flags'};
} elsif (is_custom_model($cputype)) {
$custom_cpu = get_custom_model($cputype);
$cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
@ -504,6 +539,9 @@ sub get_cpu_options {
)
: undef;
my $builtin_cputype_flags = parse_cpuflag_list(
$cpu_flag_any_re, "set by builtin CPU model", $builtin_cpu->{flags});
my $custom_cputype_flags = parse_cpuflag_list(
$cpu_flag_any_re, "set by custom CPU model", $custom_cpu->{flags});
@ -534,7 +572,7 @@ sub get_cpu_options {
# will be resolved in parameter order
$cpu_str .= resolve_cpu_flags(
$pve_flags, $hv_flags, $custom_cputype_flags, $vm_flags, $pve_forced_flags);
$pve_flags, $hv_flags, $builtin_cputype_flags, $custom_cputype_flags, $vm_flags, $pve_forced_flags);
my $phys_bits = '';
foreach my $conf ($custom_cpu, $cpu) {