Document which fields are inherited when a CPU model is based on another model. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - new patch src/cpu/cpu_x86.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 97d6e00007..37f3b6e3ce 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -147,13 +147,21 @@ struct _virCPUx86Signatures { typedef struct _virCPUx86Model virCPUx86Model; struct _virCPUx86Model { + /* Not inherited from ancestor */ char *name; + /* Not inherited from ancestor */ bool decodeHost; + /* Not inherited from ancestor */ bool decodeGuest; + /* Not inherited from ancestor */ bool compatCheck; + /* Inherited from ancestor */ virCPUx86Vendor *vendor; + /* Inherited from ancestor */ virCPUx86Signatures *signatures; + /* Inherited from ancestor */ virCPUx86Data data; + /* Not inherited from ancestor */ GStrv removedFeatures; /* Features added to the CPU model after its original version was released. @@ -164,6 +172,7 @@ struct _virCPUx86Model { * included in the CPU model by the hypervisor, but libvirt didn't support * them when introducing the CPU model. In other words, they were enabled, * but we ignored them. + * Not inherited from ancestor. */ GStrv addedFeatures; }; -- 2.47.0

When removing features unknown to QEMU (they have a different name or are completely missing as they are not configurable by a user) I should not have removed them from the list of features unknown to QEMU in the script for synchronizing QEMU features to the CPU map. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Notes: Version 2: - no change src/cpu_map/sync_qemu_features_i386.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py index 15a7af85cb..21df37e9d6 100755 --- a/src/cpu_map/sync_qemu_features_i386.py +++ b/src/cpu_map/sync_qemu_features_i386.py @@ -70,6 +70,9 @@ FEATURES_EXTRA = { 18: "cvt16", }, (0x0000048c,): { + 8: "vmx-ept-uc", + 14: "vmx-ept-wb", + 41: "vmx-invvpid-single-context", # wrong name in qemu 43: "vmx-invvpid-single-context-noglobals", # wrong name in qemu } } -- 2.47.0

We don't change definitions of CPU models which were already included in a libvirt release to maintain migration compatibility. Thus the script can just skip existing models and save us from having to drop the changes it would do to them. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Notes: Version 2: - no change src/cpu_map/sync_qemu_models_i386.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 78c2bffab2..f7b06a7716 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -535,6 +535,10 @@ def main(): for model in models: name = os.path.join(args.outdir, f"x86_{model['name']}.xml") + if os.path.isfile(name): + # Ignore existing models as CPU models in libvirt should never + # change once released. + continue with open(name, "wt") as f: output_model(f, model) -- 2.47.0

Each CPU model with -v* suffix is defined as a standalone model copying all attributes of the previous version. CPU model versions with an alias are handled differently. The full definition is used for the alias and the versioned model is created as an identical copy of the alias. To avoid breaking migration compatibility of host-model CPUs all versioned models are marked with <decode guest='off'/> so that they are ignored when selecting candidates for host-model. It's not ideal but not doing so would break almost all host-model CPUs as the new versioned CPU models have all vmx-* features included since their introduction while existing CPU models were updated later. This meas existing models would be accompanied with a long list of vmx-* features to properly describe a host CPU while the newly added CPU models would have those features enabled implicitly and their list of features would be significantly shorter. Thus the new models would always be better candidates for host-model than the existing models. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - make -v? variants linked to their corresponding non-versioned models (such as -noTSX, -IBRS, etc.) - all -v? variants are marked with <decode guest='off'/> src/cpu_map/sync_qemu_models_i386.py | 44 ++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 13f62780e6..5169d50b08 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -454,11 +454,21 @@ def expand_model(model): versions = model.pop(".versions", []) for k, v in model.items(): result["extra"]["model" + k] = v + + print(result['name']) yield result + name = result["name"] for version in versions: result = copy.deepcopy(result) - result["name"] = version.pop(".alias", result["name"]) + + ver = int(version.pop(".version")) + result["name"] = f"{name}-v{ver}" + result["base"] = name + + alias = version.pop(".alias", None) + if not alias and ver == 1: + alias = name props = version.pop(".props", dict()) for k, v in props: @@ -477,7 +487,24 @@ def expand_model(model): for k, v in version.items(): result["extra"]["version" + k] = v - yield result + if alias: + print(f"v{ver}: {result['name']} => {alias}") + yield { + "vendor": result["vendor"], + "name": result["name"], + "base": result["base"], + "alias": alias, + "extra": None, + "features": [], + } + + if ver != 1: + result["name"] = alias + print(f"v{ver}: {result['name']}") + yield result + else: + print(f"v{ver}: {result['name']}") + yield result def output_model(f, model): @@ -487,11 +514,18 @@ def output_model(f, model): f.write(f" '{k}': '{v}'\n") f.write("-->\n") + decode = "off" if "base" in model else "on" + f.write("<cpus>\n") f.write(f" <model name='{model['name']}'>\n") - f.write(" <decode host='on' guest='on'/>\n") - f.write(f" <signature family='{model['family']}' model='{model['model']}'/>\n") - f.write(f" <vendor name='{model['vendor']}'/>\n") + f.write(f" <decode host='on' guest='{decode}'/>\n") + + if "alias" in model: + f.write(f" <model name='{model['alias']}'/>\n") + else: + f.write(f" <signature family='{model['family']}' model='{model['model']}'/>\n") + f.write(f" <vendor name='{model['vendor']}'/>\n") + for feature in sorted(model["features"]): f.write(f" <feature name='{feature}'/>\n") f.write(" </model>\n") -- 2.47.0

XMLs parse/format round trip using lxml results in an XML document that almost exactly matches the original (including comments). Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Notes: Version 2: - no change src/cpu_map/sync_qemu_models_i386.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 58600bffe5..ce3c39de96 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -4,7 +4,7 @@ import argparse import copy import os import re -import xml.etree.ElementTree +import lxml.etree import lark @@ -592,7 +592,7 @@ def main(): try: filename = os.path.join(args.outdir, "x86_features.xml") - dom = xml.etree.ElementTree.parse(filename) + dom = lxml.etree.parse(filename) known = [x.attrib["name"] for x in dom.getroot().iter("feature")] unknown = [x for x in features if x not in known and x is not None] except Exception as e: -- 2.47.0

Add all newly generated CPU models to the appropriate section of index.xml. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - use <group name='...'> instead of <group vendor='...'> src/cpu_map/sync_qemu_models_i386.py | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index ce3c39de96..024bc92f07 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -533,6 +533,35 @@ def output_model(f, extra, model): f.write("</cpus>\n") +def update_index(outdir, models): + index = os.path.join(outdir, "index.xml") + xml = lxml.etree.parse(index) + + for vendor, files in models.items(): + groups = xml.xpath(f"//arch[@name='x86']/group[@name='{vendor} CPU models']") + if not groups: + continue + + group = groups[-1] + last = group.getchildren()[-1] + group_indent = last.tail + indent = f"{group_indent} " + last.tail = indent + + for file in files: + include = lxml.etree.SubElement(group, "include", filename=file) + include.tail = indent + + group.getchildren()[-1].tail = group_indent + + out = lxml.etree.tostring(xml, encoding="UTF-8") + out = out.decode("UTF-8").replace('"', "'") + + with open(index, "w") as f: + f.write(out) + f.write("\n") + + def main(): parser = argparse.ArgumentParser( description="Synchronize x86 cpu models from QEMU i386 target.") @@ -573,6 +602,8 @@ def main(): for model in models_json: models.extend(expand_model(model)) + files = dict() + for model in models: name = f"x86_{model['name']}.xml" path = os.path.join(args.outdir, name) @@ -582,10 +613,18 @@ def main(): # change once released. continue + vendor = model['vendor'] + if vendor: + if vendor not in files: + files[vendor] = [] + files[vendor].append(name) + extra = os.path.join(args.outdir, f"x86_{model['name']}.extra") with open(path, "wt") as f: output_model(f, extra, model) + update_index(args.outdir, files) + features = set() for model in models: features.update(model["features"]) -- 2.47.0

Record a fact a specific CPU model was derived from another one. The original model is also marked as an alias of the new one in case it did not change any properties of the original CPU. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - new patch src/cpu/cpu_x86.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 285b272ce8..ce3506be55 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -180,6 +180,17 @@ struct _virCPUx86Model { * The corresponding features are a genuine part of the new model. */ GStrv addedFeatures; + + /* Pinter to the model this one was derived from. */ + virCPUx86Model *ancestor; + + /* Pointer to the canonical model if this model is just an alias. + * Because the aliases were actually added to the CPU map before their + * canonical models, we store this relation in the XML reversed. That is, + * this model contains all the data and the canonical model is defined + * using this model as an ancestor without adding any additional data. + */ + const virCPUx86Model *canonical; }; typedef struct _virCPUx86Map virCPUx86Map; @@ -1567,6 +1578,7 @@ x86ModelParseAncestor(virCPUx86Model *model, return -1; } + model->ancestor = ancestor; model->vendor = ancestor->vendor; model->signatures = virCPUx86SignaturesCopy(ancestor->signatures); x86DataCopy(&model->data, &ancestor->data); @@ -1582,9 +1594,11 @@ x86ModelParseAncestor(virCPUx86Model *model, } +/* Updates @changed if signatures are set. */ static int x86ModelParseSignatures(virCPUx86Model *model, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + bool *changed) { g_autofree xmlNodePtr *nodes = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) @@ -1628,14 +1642,17 @@ x86ModelParseSignatures(virCPUx86Model *model, return -1; } + *changed = true; return 0; } +/* Updates @changed if vendor changes. */ static int x86ModelParseVendor(virCPUx86Model *model, xmlXPathContextPtr ctxt, - virCPUx86Map *map) + virCPUx86Map *map, + bool *changed) { g_autofree char *vendor = NULL; int rc; @@ -1658,14 +1675,17 @@ x86ModelParseVendor(virCPUx86Model *model, return -1; } + *changed = true; return 0; } +/* Updates @changed if features are added. */ static int x86ModelParseFeatures(virCPUx86Model *model, xmlXPathContextPtr ctxt, - virCPUx86Map *map) + virCPUx86Map *map, + bool *changed) { g_autofree xmlNodePtr *nodes = NULL; size_t i; @@ -1725,6 +1745,7 @@ x86ModelParseFeatures(virCPUx86Model *model, model->removedFeatures = g_renew(char *, model->removedFeatures, nremoved + 1); model->addedFeatures = g_renew(char *, model->addedFeatures, nadded + 1); + *changed = true; return 0; } @@ -1736,6 +1757,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, { virCPUx86Map *map = data; g_autoptr(virCPUx86Model) model = NULL; + bool changed = false; if (x86ModelFind(map, name)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1755,15 +1777,28 @@ x86ModelParse(xmlXPathContextPtr ctxt, if (x86ModelParseAncestor(model, ctxt, map) < 0) return -1; - if (x86ModelParseSignatures(model, ctxt) < 0) + if (x86ModelParseSignatures(model, ctxt, &changed) < 0) return -1; - if (x86ModelParseVendor(model, ctxt, map) < 0) + if (x86ModelParseVendor(model, ctxt, map, &changed) < 0) return -1; - if (x86ModelParseFeatures(model, ctxt, map) < 0) + if (x86ModelParseFeatures(model, ctxt, map, &changed) < 0) return -1; + if (model->ancestor && !changed) { + if (model->ancestor->canonical) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot set CPU model '%1$s' as canonical name of '%2$s' which is already an alias of '%3$s'"), + model->name, + model->ancestor->name, + model->ancestor->canonical->name); + return -1; + } + + model->ancestor->canonical = model; + } + VIR_APPEND_ELEMENT(map->models, map->nmodels, model); return 0; -- 2.47.0

Some models are just aliases to other models. Make this relation available to users via domain capabilities. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - new patch docs/formatdomaincaps.rst | 8 +++++--- src/conf/domain_capabilities.c | 11 +++++++++-- src/conf/domain_capabilities.h | 4 +++- src/qemu/qemu_capabilities.c | 10 +++++++--- tests/cputest.c | 5 +++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 886a9f71e1..ed95af4fee 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -193,12 +193,12 @@ CPUs <formatdomain.html#cpu-model-and-topology>`__. <feature policy='require' name='vmx'/> </mode> <mode name='custom' supported='yes'> - <model usable='no' deprecated='no' vendor='Intel'>Broadwell</model> + <model usable='no' deprecated='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='rtm'/> </blockers> - <model usable='yes' deprecated='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='yes' deprecated='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <model usable='no' deprecated='no' vendor='AMD'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='clzero'/> @@ -265,7 +265,9 @@ more details about it: the hypervisor's policy on usage of this model :since:`(since 7.1.0)`. The ``vendor`` attribute :since:`(since 8.9.0)` contains the vendor of the CPU model for users who want to use CPU models with specific vendors only. CPU - models with undefined vendor will be listed with ``vendor='unkwnown'``. + models with undefined vendor will be listed with ``vendor='unkwnown'``. The + ``canonical`` attribute :since:`(since 10.10.0)` contains a canonical name of + the CPU model if the model is actually an alias to another one. I/O Threads ~~~~~~~~~~~ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 5f70a48cec..ab715b19d8 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -122,6 +122,7 @@ virDomainCapsCPUModelsDispose(void *obj) g_free(cpuModels->models[i].name); g_strfreev(cpuModels->models[i].blockers); g_free(cpuModels->models[i].vendor); + g_free(cpuModels->models[i].canonical); } g_free(cpuModels->models); @@ -184,7 +185,8 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModels *old) old->models[i].usable, old->models[i].blockers, old->models[i].deprecated, - old->models[i].vendor); + old->models[i].vendor, + old->models[i].canonical); } return cpuModels; @@ -197,7 +199,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels, virDomainCapsCPUUsable usable, char **blockers, bool deprecated, - const char *vendor) + const char *vendor, + const char *canonical) { virDomainCapsCPUModel *cpu; @@ -212,6 +215,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels, cpu->blockers = g_strdupv(blockers); cpu->deprecated = deprecated; cpu->vendor = g_strdup(vendor); + cpu->canonical = g_strdup(canonical); } @@ -430,6 +434,9 @@ virDomainCapsCPUCustomFormat(virBuffer *buf, else virBufferAddLit(buf, " vendor='unknown'"); + if (model->canonical) + virBufferAsprintf(buf, " canonical='%s'", model->canonical); + virBufferAsprintf(buf, ">%s</model>\n", model->name); if (model->blockers) { diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index ef08046860..69dd1a15c1 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -189,6 +189,7 @@ struct _virDomainCapsCPUModel { char **blockers; /* NULL-terminated list of usability blockers */ bool deprecated; char *vendor; + char *canonical; }; typedef struct _virDomainCapsCPUModels virDomainCapsCPUModels; @@ -331,7 +332,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels, virDomainCapsCPUUsable usable, char **blockers, bool deprecated, - const char *vendor); + const char *vendor, + const char *canonical); virDomainCapsCPUModel * virDomainCapsCPUModelsGet(virDomainCapsCPUModels *cpuModels, const char *name); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5ac9f306f5..dec3199fce 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2144,7 +2144,7 @@ virQEMUCapsCPUDefsToModels(virArch arch, qemuMonitorCPUDefs *defs, const char **modelAllowed, const char **modelForbidden, - bool vendors) + bool extraInfo) { virDomainCapsCPUModels *cpuModels = NULL; size_t i; @@ -2155,6 +2155,7 @@ virQEMUCapsCPUDefsToModels(virArch arch, for (i = 0; i < defs->ncpus; i++) { qemuMonitorCPUDefInfo *cpu = defs->cpus + i; const char *vendor = NULL; + const char *canonical = NULL; if (modelAllowed && !g_strv_contains(modelAllowed, cpu->name)) continue; @@ -2162,11 +2163,14 @@ virQEMUCapsCPUDefsToModels(virArch arch, if (modelForbidden && g_strv_contains(modelForbidden, cpu->name)) continue; - if (vendors) + if (extraInfo) { vendor = virCPUGetVendorForModel(arch, cpu->name); + canonical = virCPUGetCanonicalModel(arch, cpu->name); + } virDomainCapsCPUModelsAdd(cpuModels, cpu->name, cpu->usable, - cpu->blockers, cpu->deprecated, vendor); + cpu->blockers, cpu->deprecated, + vendor, canonical); } virDomainCapsCPUModelsSort(cpuModels); diff --git a/tests/cputest.c b/tests/cputest.c index 32bf86997a..326ffebd09 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -823,7 +823,8 @@ cpuTestUpdateLive(const void *arg) } virDomainCapsCPUModelsAdd(models, expected->model, - usable, blockers, false, expected->vendor); + usable, blockers, false, + expected->vendor, NULL); cpu->fallback = VIR_CPU_FALLBACK_ALLOW; ignore_value(virCPUTranslate(data->arch, cpu, models)); @@ -902,7 +903,7 @@ cpuTestInitModels(const char **list) for (model = list; *model; model++) { virDomainCapsCPUModelsAdd(cpus, *model, VIR_DOMCAPS_CPU_USABLE_UNKNOWN, - NULL, false, NULL); + NULL, false, NULL, NULL); } return cpus; -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - allow versioned models to be used in host capabilities - canonical CPU models in domain capabilities src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_GraniteRapids-v1.xml | 6 +++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 43 +++++++++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 42 ++++++++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 41 ++++++++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 41 ++++++++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 51 ++++++++++++++++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 41 ++++++++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 51 ++++++++++++++++++- 18 files changed, 711 insertions(+), 15 deletions(-) create mode 100644 src/cpu_map/x86_GraniteRapids-v1.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 43f4f705a8..42ea986670 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -61,6 +61,7 @@ <include filename='x86_Snowridge.xml'/> <include filename='x86_SapphireRapids.xml'/> <include filename='x86_GraniteRapids.xml'/> + <include filename='x86_GraniteRapids-v1.xml'/> <include filename='x86_SierraForest.xml'/> <include filename='x86_SierraForest-v1.xml'/> </group> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index d5d1f847ec..3733ec9441 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -43,6 +43,7 @@ cpumap_data = [ 'x86_EPYC-Milan.xml', 'x86_EPYC-Rome.xml', 'x86_features.xml', + 'x86_GraniteRapids-v1.xml', 'x86_GraniteRapids.xml', 'x86_Haswell-IBRS.xml', 'x86_Haswell-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_GraniteRapids-v1.xml b/src/cpu_map/x86_GraniteRapids-v1.xml new file mode 100644 index 0000000000..0731becf92 --- /dev/null +++ b/src/cpu_map/x86_GraniteRapids-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='GraniteRapids-v1'> + <decode host='on' guest='off'/> + <model name='GraniteRapids'/> + </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 18d26fbae6..c5663a2c4c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -201,7 +201,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -250,6 +250,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 6e6a5a8b6c..d6e03061cf 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -269,7 +269,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -310,6 +310,47 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='arch-capabilities'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='mcdt-no'/> + <feature name='pcid'/> + <feature name='prefetchiti'/> + <feature name='rtm'/> + <feature name='serialize'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xfd'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 8880cc4bba..bfb8bb9f69 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -200,7 +200,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -249,6 +249,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 2cffb87550..403ae5d32e 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -202,7 +202,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -251,6 +251,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 5a7042c7ba..85d286e825 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -263,7 +263,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -303,6 +303,46 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='arch-capabilities'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='mcdt-no'/> + <feature name='pcid'/> + <feature name='prefetchiti'/> + <feature name='rtm'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xfd'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 9b18209a23..d2b1c536a0 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -201,7 +201,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -250,6 +250,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 024375a354..ce6c0a3aac 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -202,7 +202,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -251,6 +251,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index f379930ff7..8da817381c 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -258,7 +258,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -297,6 +297,45 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='arch-capabilities'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='mcdt-no'/> + <feature name='pcid'/> + <feature name='prefetchiti'/> + <feature name='rtm'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 42d3828892..ec8520f416 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -201,7 +201,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -250,6 +250,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 6a8dd51f2b..84558b42c0 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -206,7 +206,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -255,6 +255,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 08464d2709..ff726ddf51 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -257,7 +257,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -296,6 +296,45 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='arch-capabilities'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='mcdt-no'/> + <feature name='pcid'/> + <feature name='prefetchiti'/> + <feature name='rtm'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 773f068c69..20e5903f22 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -205,7 +205,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -254,6 +254,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 88f3b5208f..0fb60d2e9e 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -206,7 +206,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -255,6 +255,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 419147fc14..57c4d2f2a6 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -257,7 +257,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -296,6 +296,45 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='arch-capabilities'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='mcdt-no'/> + <feature name='pcid'/> + <feature name='prefetchiti'/> + <feature name='rtm'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 79ba1bc5fc..da9a1b8027 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -205,7 +205,7 @@ <blockers model='EPYC-Rome'> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>GraniteRapids</model> + <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> <feature name='amx-fp16'/> @@ -254,6 +254,55 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel'>GraniteRapids-v1</model> + <blockers model='GraniteRapids-v1'> + <feature name='amx-bf16'/> + <feature name='amx-fp16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='avx-vnni'/> + <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='bus-lock-detect'/> + <feature name='erms'/> + <feature name='fbsdp-no'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='mcdt-no'/> + <feature name='pbrsb-no'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='prefetchiti'/> + <feature name='psdp-no'/> + <feature name='rtm'/> + <feature name='sbdr-ssdp-no'/> + <feature name='serialize'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='tsx-ldtrk'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xfd'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 4 + src/cpu_map/meson.build | 4 + src/cpu_map/x86_Snowridge-v1.xml | 6 + src/cpu_map/x86_Snowridge-v2.xml | 143 +++++++++++++++++ src/cpu_map/x86_Snowridge-v3.xml | 145 ++++++++++++++++++ src/cpu_map/x86_Snowridge-v4.xml | 143 +++++++++++++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 25 ++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 40 ++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 25 ++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 25 ++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 40 ++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 25 ++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 36 ++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 60 +++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 36 ++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 78 +++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 74 ++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 74 ++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 45 +++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 74 ++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 74 ++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 74 ++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 45 +++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 66 +++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 62 +++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 58 ++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 58 ++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 47 +++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 58 ++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 47 +++++- 46 files changed, 2387 insertions(+), 40 deletions(-) create mode 100644 src/cpu_map/x86_Snowridge-v1.xml create mode 100644 src/cpu_map/x86_Snowridge-v2.xml create mode 100644 src/cpu_map/x86_Snowridge-v3.xml create mode 100644 src/cpu_map/x86_Snowridge-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 81cdea3441..d35eb80d03 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -59,6 +59,10 @@ <include filename='x86_Icelake-Server-noTSX.xml'/> <include filename='x86_Cooperlake.xml'/> <include filename='x86_Snowridge.xml'/> + <include filename='x86_Snowridge-v1.xml'/> + <include filename='x86_Snowridge-v2.xml'/> + <include filename='x86_Snowridge-v3.xml'/> + <include filename='x86_Snowridge-v4.xml'/> <include filename='x86_SapphireRapids.xml'/> <include filename='x86_SapphireRapids-v1.xml'/> <include filename='x86_SapphireRapids-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index b023ed03c4..cecb6d1d83 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -87,6 +87,10 @@ cpumap_data = [ 'x86_Skylake-Server-IBRS.xml', 'x86_Skylake-Server-noTSX-IBRS.xml', 'x86_Skylake-Server.xml', + 'x86_Snowridge-v1.xml', + 'x86_Snowridge-v2.xml', + 'x86_Snowridge-v3.xml', + 'x86_Snowridge-v4.xml', 'x86_Snowridge.xml', 'x86_vendors.xml', 'x86_Westmere-IBRS.xml', diff --git a/src/cpu_map/x86_Snowridge-v1.xml b/src/cpu_map/x86_Snowridge-v1.xml new file mode 100644 index 0000000000..01c6fc68ff --- /dev/null +++ b/src/cpu_map/x86_Snowridge-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Snowridge-v1'> + <decode host='on' guest='off'/> + <model name='Snowridge'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Snowridge-v2.xml b/src/cpu_map/x86_Snowridge-v2.xml new file mode 100644 index 0000000000..b299598be9 --- /dev/null +++ b/src/cpu_map/x86_Snowridge-v2.xml @@ -0,0 +1,143 @@ +<cpus> + <model name='Snowridge-v2'> + <decode host='on' guest='off'/> + <signature family='6' model='134'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='core-capability'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Snowridge-v3.xml b/src/cpu_map/x86_Snowridge-v3.xml new file mode 100644 index 0000000000..11967f814b --- /dev/null +++ b/src/cpu_map/x86_Snowridge-v3.xml @@ -0,0 +1,145 @@ +<cpus> + <model name='Snowridge-v3'> + <decode host='on' guest='off'/> + <signature family='6' model='134'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='core-capability'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Snowridge-v4.xml b/src/cpu_map/x86_Snowridge-v4.xml new file mode 100644 index 0000000000..5d11c94d97 --- /dev/null +++ b/src/cpu_map/x86_Snowridge-v4.xml @@ -0,0 +1,143 @@ +<cpus> + <model name='Snowridge-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='134'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <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='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 5579ad3fc2..6d0d347cd0 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -358,7 +358,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -370,6 +370,29 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index a111a8d751..3fff90679f 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -632,7 +632,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -651,6 +651,44 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 8882b9c8a7..155affd7a2 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -357,7 +357,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -369,6 +369,29 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b0a4bce914..97c2f3f216 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -367,7 +367,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -379,6 +379,29 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 334a523179..4f5abc3c87 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -664,7 +664,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -683,6 +683,44 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 30e5686593..1e7d5acadd 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -366,7 +366,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -378,6 +378,29 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 777b7c5198..931c1ccfa8 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -369,7 +369,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -381,6 +381,40 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 6c58d132d9..c381827ef1 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -665,7 +665,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -684,6 +684,64 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 68b0a658dd..92507c01e6 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -380,6 +380,40 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 4a055e19ec..002004001a 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -380,6 +380,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 91dbb8ff78..7ec91e11d3 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -665,7 +665,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -684,6 +684,82 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 466be5c7a0..3b449eec8d 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -367,7 +367,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -379,6 +379,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 637579d6ec..bc603035fe 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -369,7 +369,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -381,6 +381,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 1ed0cef05b..8e545b5e9d 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -660,7 +660,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -678,6 +678,78 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index acde0c66d9..e2b164f6f2 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -380,6 +380,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 591e15ab24..be1c10ba88 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -336,7 +336,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -348,6 +348,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 52086550db..d43ed80338 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -608,7 +608,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -626,6 +626,78 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 1170d8ed2c..c8f74ea60e 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -335,7 +335,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -347,6 +347,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 653a7a7bac..890b8ec2e9 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -341,7 +341,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -353,6 +353,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 779bdddad6..fb20353bbf 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -489,7 +489,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -507,6 +507,78 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 779bdddad6..fb20353bbf 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -489,7 +489,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -507,6 +507,78 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 72d4e7be39..02406d697a 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -340,7 +340,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -352,6 +352,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index c1776af083..4e70aee549 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -423,7 +423,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -435,6 +435,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index d6f4e79806..25c522f8d6 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -588,7 +588,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> <feature name='arch-capabilities'/> @@ -606,6 +606,78 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 27beded8ea..d8ef35e83f 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -422,7 +422,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -434,6 +434,49 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> 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 ce04180999..b63775042f 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -604,7 +604,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -616,6 +616,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> 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 1836c786dc..b08763142e 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -669,7 +669,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> <feature name='cldemote'/> @@ -685,6 +685,70 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index c64f62b14e..f235e3ca55 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -603,7 +603,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -615,6 +615,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> 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 ab3d52deb2..db5e71cae3 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -605,7 +605,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -617,6 +617,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> 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 2d22fd32dd..bc1c8b629c 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -658,7 +658,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> <feature name='cldemote'/> @@ -673,6 +673,66 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index a9b5f5efcb..4092b0cbaf 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -604,7 +604,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -616,6 +616,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 705e61e950..46cdc98b04 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -605,7 +605,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -617,6 +617,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 65ce9690a2..52ce59c185 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -632,7 +632,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> <feature name='cldemote'/> @@ -646,6 +646,62 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 062f47aa34..f7716b5c10 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -604,7 +604,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -616,6 +616,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 889d50f4ca..16e5de9503 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -712,7 +712,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -724,6 +724,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index f180ad3f9f..b0a266f649 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -711,7 +711,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> <feature name='cldemote'/> @@ -725,6 +725,62 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 81aeb37353..a948cd9173 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -711,7 +711,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -723,6 +723,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 7201a84435..a986a09589 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -712,7 +712,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -724,6 +724,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 958f389aa6..1ad4b0a9f3 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -711,7 +711,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> <feature name='cldemote'/> @@ -725,6 +725,62 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='arch-capabilities'/> + <feature name='cldemote'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index ade2798f6a..8051bf82a3 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -711,7 +711,7 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Snowridge</model> + <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> <feature name='core-capability'/> @@ -723,6 +723,51 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> + <model usable='no' vendor='Intel'>Snowridge-v1</model> + <blockers model='Snowridge-v1'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v2</model> + <blockers model='Snowridge-v2'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v3</model> + <blockers model='Snowridge-v3'> + <feature name='cldemote'/> + <feature name='core-capability'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='split-lock-detect'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Snowridge-v4</model> + <blockers model='Snowridge-v4'> + <feature name='cldemote'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='movdir64b'/> + <feature name='movdiri'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Intel'>Westmere</model> <model usable='no' vendor='Intel'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Icelake-Server-v2 defined as an alias to Icelake-Server-noTSX - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities - CPU models are no longer canonicalized in post-parse src/cpu_map/index.xml | 7 + src/cpu_map/meson.build | 7 + src/cpu_map/x86_Icelake-Server-v1.xml | 6 + src/cpu_map/x86_Icelake-Server-v2.xml | 6 + src/cpu_map/x86_Icelake-Server-v3.xml | 165 +++++++++++++ src/cpu_map/x86_Icelake-Server-v4.xml | 172 +++++++++++++ src/cpu_map/x86_Icelake-Server-v5.xml | 174 +++++++++++++ src/cpu_map/x86_Icelake-Server-v6.xml | 175 ++++++++++++++ src/cpu_map/x86_Icelake-Server-v7.xml | 177 ++++++++++++++ .../x86_64-cpuid-Ice-Lake-Server-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 100 +++++++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 148 +++++++++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 100 +++++++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 100 +++++++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 148 +++++++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 100 +++++++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 126 +++++++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 191 ++++++++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 126 +++++++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 126 +++++++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 191 ++++++++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 126 +++++++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 228 +++++++++++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 228 +++++++++++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 152 +++++++++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 198 ++++++++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 198 ++++++++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 195 ++++++++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 152 +++++++++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 150 +++++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 147 ++++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 141 ++++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 154 +++++++++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 183 +++++++++++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 167 ++++++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 183 +++++++++++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 183 +++++++++++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 167 ++++++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 183 +++++++++++++- 50 files changed, 7083 insertions(+), 81 deletions(-) create mode 100644 src/cpu_map/x86_Icelake-Server-v1.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v2.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml create mode 100644 src/cpu_map/x86_Icelake-Server-v7.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 923954b763..be39f356f1 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -57,6 +57,13 @@ <include filename='x86_Icelake-Client-noTSX.xml'/> <include filename='x86_Icelake-Server.xml'/> <include filename='x86_Icelake-Server-noTSX.xml'/> + <include filename='x86_Icelake-Server-v1.xml'/> + <include filename='x86_Icelake-Server-v2.xml'/> + <include filename='x86_Icelake-Server-v3.xml'/> + <include filename='x86_Icelake-Server-v4.xml'/> + <include filename='x86_Icelake-Server-v5.xml'/> + <include filename='x86_Icelake-Server-v6.xml'/> + <include filename='x86_Icelake-Server-v7.xml'/> <include filename='x86_Cooperlake.xml'/> <include filename='x86_Cooperlake-v1.xml'/> <include filename='x86_Cooperlake-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index e08d8ccda7..87617101aa 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -54,6 +54,13 @@ cpumap_data = [ 'x86_Icelake-Client-noTSX.xml', 'x86_Icelake-Client.xml', 'x86_Icelake-Server-noTSX.xml', + 'x86_Icelake-Server-v1.xml', + 'x86_Icelake-Server-v2.xml', + 'x86_Icelake-Server-v3.xml', + 'x86_Icelake-Server-v4.xml', + 'x86_Icelake-Server-v5.xml', + 'x86_Icelake-Server-v6.xml', + 'x86_Icelake-Server-v7.xml', 'x86_Icelake-Server.xml', 'x86_IvyBridge-IBRS.xml', 'x86_IvyBridge.xml', diff --git a/src/cpu_map/x86_Icelake-Server-v1.xml b/src/cpu_map/x86_Icelake-Server-v1.xml new file mode 100644 index 0000000000..4c48816587 --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Icelake-Server-v1'> + <decode host='on' guest='off'/> + <model name='Icelake-Server'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v2.xml b/src/cpu_map/x86_Icelake-Server-v2.xml new file mode 100644 index 0000000000..3fbb9f40cb --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Icelake-Server-v2'> + <decode host='on' guest='off'/> + <model name='Icelake-Server-noTSX'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v3.xml b/src/cpu_map/x86_Icelake-Server-v3.xml new file mode 100644 index 0000000000..2bdbe8861d --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v3.xml @@ -0,0 +1,165 @@ +<cpus> + <model name='Icelake-Server-v3'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <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='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v4.xml b/src/cpu_map/x86_Icelake-Server-v4.xml new file mode 100644 index 0000000000..b6e02317c5 --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v4.xml @@ -0,0 +1,172 @@ +<cpus> + <model name='Icelake-Server-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='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='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v5.xml b/src/cpu_map/x86_Icelake-Server-v5.xml new file mode 100644 index 0000000000..d3fad58845 --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v5.xml @@ -0,0 +1,174 @@ +<cpus> + <model name='Icelake-Server-v5'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='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='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v6.xml b/src/cpu_map/x86_Icelake-Server-v6.xml new file mode 100644 index 0000000000..f434f4c50c --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v6.xml @@ -0,0 +1,175 @@ +<cpus> + <model name='Icelake-Server-v6'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='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='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='gfni'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-page-walk-5'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Icelake-Server-v7.xml b/src/cpu_map/x86_Icelake-Server-v7.xml new file mode 100644 index 0000000000..11d155024a --- /dev/null +++ b/src/cpu_map/x86_Icelake-Server-v7.xml @@ -0,0 +1,177 @@ +<cpus> + <model name='Icelake-Server-v7'> + <decode host='on' guest='off'/> + <signature family='6' model='106'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='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='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <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='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='sep'/> + <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='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-page-walk-5'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml index 1519793fca..443971b9f2 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Icelake-Server</model> + <model>Icelake-Server-v1</model> <vendor>Intel</vendor> <signature family='6' model='106' stepping='0'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index e8bcba9fc1..0f4ee36d0d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -231,7 +231,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -255,7 +255,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -277,6 +277,102 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 30d652e640..a365cd9db5 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -429,7 +429,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -462,7 +462,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -493,6 +493,150 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index ad76c3e130..e7457b3433 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -230,7 +230,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -254,7 +254,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -276,6 +276,102 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index c55f8e34b9..56e8aeda5f 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -240,7 +240,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -264,7 +264,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -286,6 +286,102 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index e03c10eb84..e5c5dadd5c 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -461,7 +461,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -494,7 +494,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -525,6 +525,150 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 6cfa5828bb..4661ca8fc3 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -239,7 +239,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -263,7 +263,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -285,6 +285,102 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 50941234d6..c9785bf41a 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -263,7 +263,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -287,7 +287,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -309,6 +309,128 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 93cc2bd1f2..323f372ae1 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -498,7 +498,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -531,7 +531,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -562,6 +562,193 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 7a69746717..bb4f0ae925 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -262,7 +262,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -286,7 +286,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -308,6 +308,128 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 8a077e113d..4f40568023 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -260,7 +260,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -284,7 +284,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -306,6 +306,128 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 59145f6dfe..48e40883a0 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -496,7 +496,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -529,7 +529,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -560,6 +560,193 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 6f76e4795f..71b92316e5 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -259,7 +259,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -283,7 +283,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -305,6 +305,128 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 44eff055b4..455e6fff84 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -261,7 +261,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -285,7 +285,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -307,6 +307,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 5ccb0a9914..1e54fd398d 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -493,7 +493,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -525,7 +525,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -555,6 +555,230 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 8d364912f2..6531049aff 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -260,7 +260,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -284,7 +284,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -306,6 +306,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index e33078702c..cde60502d5 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -228,7 +228,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -252,7 +252,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -274,6 +274,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 62bd747f47..a0b652df0e 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -441,7 +441,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -473,7 +473,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -503,6 +503,230 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 46f2582342..97bb824317 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -227,7 +227,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -251,7 +251,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -273,6 +273,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 04173eab2d..9ba9ac5008 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -233,7 +233,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -257,7 +257,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -279,6 +279,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 72e50e80e3..849756739a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -358,7 +358,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -385,7 +385,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -410,6 +410,200 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 72e50e80e3..849756739a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -358,7 +358,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -385,7 +385,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -410,6 +410,200 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index bfd4582994..3edab09abd 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -232,7 +232,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -256,7 +256,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -278,6 +278,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index c460ef2747..7cfe1538d1 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -233,7 +233,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -257,7 +257,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -279,6 +279,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index 70cc61a266..7a35a7ae24 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -361,7 +361,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -388,7 +388,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx512-vpopcntdq'/> @@ -413,6 +413,197 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='mds-no'/> + <feature name='pcid'/> + <feature name='pschange-mc-no'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='taa-no'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index e4a6e0d835..f63dc64c38 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -232,7 +232,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -256,7 +256,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -278,6 +278,154 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> 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 52d5f90429..8638cb6eb2 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -392,7 +392,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -414,6 +414,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> 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 a11ab737f6..2968dc71a2 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -428,7 +428,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -452,7 +452,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -474,6 +474,152 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index a6c02c0eb7..bc8bbc31b1 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -367,7 +367,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -391,7 +391,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -413,6 +413,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> 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 b12b0a0738..f0c374491a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -369,7 +369,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -393,7 +393,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -415,6 +415,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> 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 58fbf2e156..fb989bb068 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -420,7 +420,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -444,7 +444,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -466,6 +466,149 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 9df7ab5d51..59076315d0 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -392,7 +392,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -414,6 +414,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index c6dd80de95..45e1a712d5 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -369,7 +369,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -393,7 +393,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -415,6 +415,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 4cec75464f..4d222bbbdf 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -407,7 +407,7 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -430,7 +430,7 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -451,6 +451,143 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 7bcc10e61c..f9250ef372 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -368,7 +368,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -392,7 +392,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -414,6 +414,156 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 3fb82c81ad..0e40fdc47e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -373,7 +373,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -397,7 +397,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -419,6 +419,185 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 7600b69f9f..bc29e8dda4 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -406,7 +406,7 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -429,7 +429,7 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -450,6 +450,169 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index e8e1b804f6..a70abf2263 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -372,7 +372,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -396,7 +396,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -418,6 +418,185 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index dfcaa22ea3..1cd20a0049 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -373,7 +373,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -397,7 +397,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -419,6 +419,185 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 43348c344c..ab6f60cfa1 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -406,7 +406,7 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -429,7 +429,7 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -450,6 +450,169 @@ <feature name='vpclmulqdq'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='arch-capabilities'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <feature name='arch-capabilities'/> + <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='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index bf8f4ebba3..ff31f05915 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -372,7 +372,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v1'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -396,7 +396,7 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model> + <model usable='no' vendor='Intel' canonical='Icelake-Server-v2'>Icelake-Server-noTSX</model> <blockers model='Icelake-Server-noTSX'> <feature name='avx512-vpopcntdq'/> <feature name='avx512bitalg'/> @@ -418,6 +418,185 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v1</model> + <blockers model='Icelake-Server-v1'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v2</model> + <blockers model='Icelake-Server-v2'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v3</model> + <blockers model='Icelake-Server-v3'> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='erms'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v4</model> + <blockers model='Icelake-Server-v4'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v5</model> + <blockers model='Icelake-Server-v5'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v6</model> + <blockers model='Icelake-Server-v6'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='Intel'>Icelake-Server-v7</model> + <blockers model='Icelake-Server-v7'> + <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='erms'/> + <feature name='fsrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='taa-no'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Skylake-Server-v2 defined as Skylake-Server-IBRS - Skylake-Server-v3 defined as Skylake-Server-noTSX-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 5 + src/cpu_map/meson.build | 5 + src/cpu_map/x86_Skylake-Server-v1.xml | 6 + src/cpu_map/x86_Skylake-Server-v2.xml | 6 + src/cpu_map/x86_Skylake-Server-v3.xml | 6 + src/cpu_map/x86_Skylake-Server-v4.xml | 148 +++++++++++++++++ src/cpu_map/x86_Skylake-Server-v5.xml | 150 ++++++++++++++++++ .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 89 ++++++++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 89 ++++++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 61 ++++++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 110 ++++++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 74 ++++++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 90 ++++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 90 ++++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 90 ++++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 74 ++++++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 80 +++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 80 +++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 75 ++++++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 75 ++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 75 ++++++++- 50 files changed, 3364 insertions(+), 123 deletions(-) create mode 100644 src/cpu_map/x86_Skylake-Server-v1.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v3.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index e874a45b15..af41623bc0 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -51,6 +51,11 @@ <include filename='x86_Skylake-Server.xml'/> <include filename='x86_Skylake-Server-IBRS.xml'/> <include filename='x86_Skylake-Server-noTSX-IBRS.xml'/> + <include filename='x86_Skylake-Server-v1.xml'/> + <include filename='x86_Skylake-Server-v2.xml'/> + <include filename='x86_Skylake-Server-v3.xml'/> + <include filename='x86_Skylake-Server-v4.xml'/> + <include filename='x86_Skylake-Server-v5.xml'/> <include filename='x86_Cascadelake-Server.xml'/> <include filename='x86_Cascadelake-Server-noTSX.xml'/> <include filename='x86_Cascadelake-Server-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 55f9e99283..60c14539d3 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -100,6 +100,11 @@ cpumap_data = [ 'x86_Skylake-Client.xml', 'x86_Skylake-Server-IBRS.xml', 'x86_Skylake-Server-noTSX-IBRS.xml', + 'x86_Skylake-Server-v1.xml', + 'x86_Skylake-Server-v2.xml', + 'x86_Skylake-Server-v3.xml', + 'x86_Skylake-Server-v4.xml', + 'x86_Skylake-Server-v5.xml', 'x86_Skylake-Server.xml', 'x86_Snowridge-v1.xml', 'x86_Snowridge-v2.xml', diff --git a/src/cpu_map/x86_Skylake-Server-v1.xml b/src/cpu_map/x86_Skylake-Server-v1.xml new file mode 100644 index 0000000000..130d97b3e9 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v1'> + <decode host='on' guest='off'/> + <model name='Skylake-Server'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v2.xml b/src/cpu_map/x86_Skylake-Server-v2.xml new file mode 100644 index 0000000000..dc66602166 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v2'> + <decode host='on' guest='off'/> + <model name='Skylake-Server-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v3.xml b/src/cpu_map/x86_Skylake-Server-v3.xml new file mode 100644 index 0000000000..b56510c3a5 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v3.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Server-v3'> + <decode host='on' guest='off'/> + <model name='Skylake-Server-noTSX-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v4.xml b/src/cpu_map/x86_Skylake-Server-v4.xml new file mode 100644 index 0000000000..441a343e3b --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v4.xml @@ -0,0 +1,148 @@ +<cpus> + <model name='Skylake-Server-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='85' stepping='0-4'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-v5.xml b/src/cpu_map/x86_Skylake-Server-v5.xml new file mode 100644 index 0000000000..cb3c91e335 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-v5.xml @@ -0,0 +1,150 @@ +<cpus> + <model name='Skylake-Server-v5'> + <decode host='on' guest='off'/> + <signature family='6' model='85' stepping='0-4'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <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='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml index 377b484751..d0f48997ec 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server-IBRS</model> + <model>Skylake-Server-v2</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml index f8cdd53f42..71a53982bc 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server-IBRS</model> + <model>Skylake-Server-v2</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml index 29900eb28e..e2e5acdb60 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server</model> + <model>Skylake-Server-v1</model> <vendor>Intel</vendor> <signature family='6' model='85' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 57b4a6069a..bfaae20df4 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -494,7 +494,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -508,7 +508,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -523,7 +523,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -536,6 +536,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 6358b8f227..b34875ea9b 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -853,7 +853,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -874,7 +874,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -896,7 +896,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -916,6 +916,89 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 48c89a0ad6..2cb7651d94 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -493,7 +493,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -507,7 +507,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -522,7 +522,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -535,6 +535,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 7955a18190..e2c7deb232 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -503,7 +503,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -517,7 +517,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -532,7 +532,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -545,6 +545,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 94b4aeb166..a4e9c15f3c 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -885,7 +885,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -906,7 +906,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -928,7 +928,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -948,6 +948,89 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 73a47cea6b..5b55f7168d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -502,7 +502,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -516,7 +516,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -531,7 +531,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -544,6 +544,61 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 8d41090780..ba98897a59 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -567,7 +567,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -581,7 +581,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -596,7 +596,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -609,6 +609,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 8ad064a22c..e1b2fdf523 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -993,7 +993,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1014,7 +1014,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1036,7 +1036,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1056,6 +1056,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 83ae31017b..0782742c55 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -566,7 +566,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -580,7 +580,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -595,7 +595,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -608,6 +608,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index fa2a3c71b7..44b85a22bf 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -564,7 +564,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -578,7 +578,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -593,7 +593,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -606,6 +606,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 0e8730b1ca..04bc338a05 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -991,7 +991,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1012,7 +1012,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1034,7 +1034,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1054,6 +1054,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 66ee266274..9ca8aea50d 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -563,7 +563,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -577,7 +577,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -592,7 +592,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,6 +605,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index d7d70ca91a..3da0f49414 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -591,7 +591,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,7 +605,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -620,7 +620,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -633,6 +633,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 4dfced633e..ff8f07bcaf 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1023,7 +1023,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1044,7 +1044,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1066,7 +1066,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1086,6 +1086,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 4492a6046a..eedca7f9d2 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -590,7 +590,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -604,7 +604,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -619,7 +619,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -632,6 +632,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 46cfed5f9d..b743fd5949 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -558,7 +558,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -572,7 +572,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -587,7 +587,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -600,6 +600,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 8be62f8414..f28f88244d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -971,7 +971,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -992,7 +992,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1014,7 +1014,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1034,6 +1034,110 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f976cc9868..7eb0dc6079 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -557,7 +557,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -571,7 +571,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -586,7 +586,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -599,6 +599,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 446a4ea7b3..3989e534b6 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -563,7 +563,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -577,7 +577,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -592,7 +592,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -605,6 +605,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 388e9f0341..9e0488e11f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -806,7 +806,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -823,7 +823,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -841,7 +841,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -857,6 +857,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 388e9f0341..9e0488e11f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -806,7 +806,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -823,7 +823,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -841,7 +841,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -857,6 +857,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index eac02f497a..856177f2c2 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -562,7 +562,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -576,7 +576,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -591,7 +591,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -604,6 +604,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index e0fd74a139..cd9de8aa48 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -645,7 +645,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -659,7 +659,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -674,7 +674,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -687,6 +687,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index be5e5b16b0..ddafb0c97d 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -902,7 +902,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -919,7 +919,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -937,7 +937,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx512bw'/> @@ -953,6 +953,90 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='3dnowprefetch'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 9573f80845..c8b413eeb4 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -644,7 +644,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -658,7 +658,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -673,7 +673,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -686,6 +686,74 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> 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 1b4ceacb16..2348b8a948 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> 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 bcd73d2eb9..05a4a1c4d1 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -902,7 +902,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -917,7 +917,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -933,7 +933,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -947,6 +947,80 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 1fceafeaa8..80c021fae5 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -829,7 +829,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -843,7 +843,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -858,7 +858,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -871,6 +871,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> 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 b3b3c5c538..a10f245559 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -831,7 +831,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -845,7 +845,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -860,7 +860,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -873,6 +873,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> 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 050160af25..3c1c3ccc46 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -888,7 +888,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -903,7 +903,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -919,7 +919,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -933,6 +933,80 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 1c8b91caa6..35a04b58da 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 00950d1c3e..fe41e2f42d 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -831,7 +831,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -845,7 +845,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -860,7 +860,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -873,6 +873,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index a24a446373..a382908512 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -852,7 +852,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -866,7 +866,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -881,7 +881,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -894,6 +894,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index c5126d4c10..83d5e8bbef 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -830,7 +830,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -844,7 +844,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -859,7 +859,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -872,6 +872,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 607f0d1dcb..3f89567e0a 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -967,7 +967,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -981,7 +981,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -996,7 +996,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1009,6 +1009,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 729afba017..f2db7c9e9e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -957,7 +957,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -971,7 +971,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -986,7 +986,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -999,6 +999,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 4fe1f27009..eca4245c4b 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -966,7 +966,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -980,7 +980,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -995,7 +995,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1008,6 +1008,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 7ac02a6559..980bc162b9 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -967,7 +967,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -981,7 +981,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -996,7 +996,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1009,6 +1009,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index c3ccc4a83d..3960ab67f8 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -957,7 +957,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -971,7 +971,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -986,7 +986,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -999,6 +999,75 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='arch-capabilities'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index dac46b82f7..5a177fd1ed 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -966,7 +966,7 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -980,7 +980,7 @@ <feature name='pku'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v2'>Skylake-Server-IBRS</model> <blockers model='Skylake-Server-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -995,7 +995,7 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Server-v3'>Skylake-Server-noTSX-IBRS</model> <blockers model='Skylake-Server-noTSX-IBRS'> <feature name='avx512bw'/> <feature name='avx512cd'/> @@ -1008,6 +1008,75 @@ <feature name='pku'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v1</model> + <blockers model='Skylake-Server-v1'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v2</model> + <blockers model='Skylake-Server-v2'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v3</model> + <blockers model='Skylake-Server-v3'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v4</model> + <blockers model='Skylake-Server-v4'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Server-v5</model> + <blockers model='Skylake-Server-v5'> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Snowridge-v1'>Snowridge</model> <blockers model='Snowridge'> <feature name='cldemote'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Broadwell-v2 defined as Broadwell-noTSX - Broadwell-v3 defined as Broadwell-IBRS - Broadwell-v4 defined as Broadwell-noTSX-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 4 ++ src/cpu_map/meson.build | 4 ++ src/cpu_map/x86_Broadwell-v1.xml | 6 ++ src/cpu_map/x86_Broadwell-v2.xml | 6 ++ src/cpu_map/x86_Broadwell-v3.xml | 6 ++ src/cpu_map/x86_Broadwell-v4.xml | 6 ++ .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 2 +- .../x86_64-cpuid-Core-i7-5600U-host.xml | 2 +- .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 2 +- .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 66 +++++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 38 +++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 50 ++++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 50 ++++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 50 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 42 ++++++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 42 ++++++++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 38 +++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 38 +++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 38 +++++++++-- 52 files changed, 1610 insertions(+), 166 deletions(-) create mode 100644 src/cpu_map/x86_Broadwell-v1.xml create mode 100644 src/cpu_map/x86_Broadwell-v2.xml create mode 100644 src/cpu_map/x86_Broadwell-v3.xml create mode 100644 src/cpu_map/x86_Broadwell-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 4d7f8dc700..204cce459a 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -45,6 +45,10 @@ <include filename='x86_Broadwell-noTSX-IBRS.xml'/> <include filename='x86_Broadwell.xml'/> <include filename='x86_Broadwell-IBRS.xml'/> + <include filename='x86_Broadwell-v1.xml'/> + <include filename='x86_Broadwell-v2.xml'/> + <include filename='x86_Broadwell-v3.xml'/> + <include filename='x86_Broadwell-v4.xml'/> <include filename='x86_Skylake-Client.xml'/> <include filename='x86_Skylake-Client-IBRS.xml'/> <include filename='x86_Skylake-Client-noTSX-IBRS.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 9fea2059bd..410f29f505 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -27,6 +27,10 @@ cpumap_data = [ 'x86_Broadwell-IBRS.xml', 'x86_Broadwell-noTSX-IBRS.xml', 'x86_Broadwell-noTSX.xml', + 'x86_Broadwell-v1.xml', + 'x86_Broadwell-v2.xml', + 'x86_Broadwell-v3.xml', + 'x86_Broadwell-v4.xml', 'x86_Broadwell.xml', 'x86_Cascadelake-Server-noTSX.xml', 'x86_Cascadelake-Server-v1.xml', diff --git a/src/cpu_map/x86_Broadwell-v1.xml b/src/cpu_map/x86_Broadwell-v1.xml new file mode 100644 index 0000000000..3bbf3f4070 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v1'> + <decode host='on' guest='off'/> + <model name='Broadwell'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v2.xml b/src/cpu_map/x86_Broadwell-v2.xml new file mode 100644 index 0000000000..209bf1df2c --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v2'> + <decode host='on' guest='off'/> + <model name='Broadwell-noTSX'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v3.xml b/src/cpu_map/x86_Broadwell-v3.xml new file mode 100644 index 0000000000..eec3beee73 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v3.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v3'> + <decode host='on' guest='off'/> + <model name='Broadwell-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-v4.xml b/src/cpu_map/x86_Broadwell-v4.xml new file mode 100644 index 0000000000..60fec5285f --- /dev/null +++ b/src/cpu_map/x86_Broadwell-v4.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Broadwell-v4'> + <decode host='on' guest='off'/> + <model name='Broadwell-noTSX-IBRS'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml index 32bfc2521e..872b531c0f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml index 32bfc2521e..872b531c0f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml index aeea45b444..d99718d9f7 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell-IBRS</model> + <model>Broadwell-v3</model> <vendor>Intel</vendor> <signature family='6' model='61' stepping='4'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml index ab7c422861..6280bf46cc 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell-IBRS</model> + <model>Broadwell-v3</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml index feb5514d22..7b3c52f39a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml index feb5514d22..7b3c52f39a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Broadwell</model> + <model>Broadwell-v1</model> <vendor>Intel</vendor> <signature family='6' model='79' stepping='1'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 0a1dd449a7..d05a506975 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 69d7cc7683..a8e28d279c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -75,7 +75,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -90,7 +90,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -106,7 +106,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -119,7 +119,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -133,6 +133,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 479a03c07c..17954892e0 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -62,7 +62,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -70,7 +70,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -79,19 +79,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 7a6b9f622c..c7f12089c7 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index ac171ae9c2..c2229b8837 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -76,7 +76,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -107,7 +107,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -120,7 +120,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -134,6 +134,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 43f52d1449..aa5f264c52 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -62,7 +62,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -70,7 +70,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -79,19 +79,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index ab3c8a5a3b..2e41f8919a 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 8a426d1838..a0fd318734 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -76,7 +76,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -107,7 +107,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -120,7 +120,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -134,6 +134,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index ce9f57dfe2..3c599581f7 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index cb31bebb9f..9b8a512f12 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index a8911370e2..7831820858 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -93,7 +93,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -109,7 +109,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -122,7 +122,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -136,6 +136,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index cc576447f7..b3ac57b859 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -63,7 +63,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -71,7 +71,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -80,19 +80,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index b616d4a1e6..340266c243 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -65,7 +65,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -73,7 +73,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -82,19 +82,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 53c50c2ddc..f578d1a270 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -79,7 +79,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -94,7 +94,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -110,7 +110,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -123,7 +123,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -137,6 +137,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 2454a6f8c1..2a2db648e7 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -64,7 +64,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -72,7 +72,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -81,19 +81,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index ceef8576a4..bb9bb28922 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -66,7 +66,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -74,7 +74,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -83,19 +83,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index c4ca961052..aadac29f25 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -79,7 +79,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -94,7 +94,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -110,7 +110,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -123,7 +123,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -137,6 +137,64 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 5cd771a999..1a8fb7a7fa 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -65,7 +65,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -73,7 +73,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -82,19 +82,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index f0f3b2e5c3..2751f9a93f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -71,7 +71,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -88,19 +88,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 366b94f6fd..a891514df0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -68,7 +68,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -100,7 +100,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -110,6 +110,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 366b94f6fd..a891514df0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -68,7 +68,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -91,7 +91,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -100,7 +100,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -110,6 +110,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 730e4ab447..eaaabd40e2 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -70,7 +70,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -78,7 +78,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -87,19 +87,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 95b4936952..5f16ac097d 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -71,7 +71,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -79,7 +79,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -88,19 +88,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index fc3502beeb..4951414527 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -83,7 +83,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -95,7 +95,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -104,7 +104,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -114,6 +114,48 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 7f36f932bd..e90833b281 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -70,7 +70,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -78,7 +78,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -87,19 +87,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 9ea66dbe8a..708cfb621c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 13f10d885a..468a78e05a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -82,7 +82,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -92,14 +92,14 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -107,6 +107,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 7627ddb1d5..54320ebc71 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -80,7 +80,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -89,19 +89,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 fc3e1855e7..8df44a2e65 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -82,7 +82,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -91,19 +91,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> 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 eccf032aa5..8767ab2872 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -72,7 +72,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -91,14 +91,14 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -106,6 +106,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 2962fb2097..f6959a66eb 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 137c4e62f6..f338a2a0f4 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -82,7 +82,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -91,19 +91,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 82a369cf25..3b799a6c96 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -74,7 +74,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -82,7 +82,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -91,19 +91,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index fa030eb235..cbffd21e13 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -81,7 +81,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -90,19 +90,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index f99ca4b2e6..3f59106b1a 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -86,7 +86,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -95,19 +95,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 1f38493b16..42a0c34a34 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -90,19 +90,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index a89a36b9b1..f3f3b54a8f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -77,7 +77,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -85,7 +85,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -94,19 +94,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 3f5ab7b44d..f8dfc27dc3 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -78,7 +78,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -86,7 +86,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -95,19 +95,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 146d166ff7..223eaaf68d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -73,7 +73,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='hle'/> <feature name='invpcid'/> @@ -81,7 +81,7 @@ <feature name='rtm'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -90,19 +90,49 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 6b18f6a9ad..21e1746110 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -77,7 +77,7 @@ </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>486</model> - <model usable='no' vendor='Intel'>Broadwell</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model> <blockers model='Broadwell'> <feature name='erms'/> <feature name='hle'/> @@ -85,7 +85,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v3'>Broadwell-IBRS</model> <blockers model='Broadwell-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -94,19 +94,49 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v2'>Broadwell-noTSX</model> <blockers model='Broadwell-noTSX'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> </blockers> - <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Broadwell-v4'>Broadwell-noTSX-IBRS</model> <blockers model='Broadwell-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Broadwell-v1</model> + <blockers model='Broadwell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v2</model> + <blockers model='Broadwell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v3</model> + <blockers model='Broadwell-v3'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Broadwell-v4</model> + <blockers model='Broadwell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model> <blockers model='Cascadelake-Server'> <feature name='avx512bw'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - IvyBridge-v2 defined as IvyBridge-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 2 ++ src/cpu_map/meson.build | 2 ++ src/cpu_map/x86_IvyBridge-v1.xml | 6 ++++++ src/cpu_map/x86_IvyBridge-v2.xml | 6 ++++++ .../x86_64-cpuid-Core-i7-3520M-host.xml | 2 +- .../x86_64-cpuid-Core-i7-3740QM-host.xml | 2 +- .../x86_64-cpuid-Core-i7-3770-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 19 +++++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 13 +++++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 15 +++++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 15 +++++++++++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 13 +++++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 13 +++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 13 +++++++++++-- 47 files changed, 505 insertions(+), 83 deletions(-) create mode 100644 src/cpu_map/x86_IvyBridge-v1.xml create mode 100644 src/cpu_map/x86_IvyBridge-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index c94be551fb..02e15bc0fb 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -37,6 +37,8 @@ <include filename='x86_SandyBridge-IBRS.xml'/> <include filename='x86_IvyBridge.xml'/> <include filename='x86_IvyBridge-IBRS.xml'/> + <include filename='x86_IvyBridge-v1.xml'/> + <include filename='x86_IvyBridge-v2.xml'/> <include filename='x86_Haswell-noTSX.xml'/> <include filename='x86_Haswell-noTSX-IBRS.xml'/> <include filename='x86_Haswell.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index e230ade8f0..5f5cbc6049 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -76,6 +76,8 @@ cpumap_data = [ 'x86_Icelake-Server-v7.xml', 'x86_Icelake-Server.xml', 'x86_IvyBridge-IBRS.xml', + 'x86_IvyBridge-v1.xml', + 'x86_IvyBridge-v2.xml', 'x86_IvyBridge.xml', 'x86_kvm32.xml', 'x86_kvm64.xml', diff --git a/src/cpu_map/x86_IvyBridge-v1.xml b/src/cpu_map/x86_IvyBridge-v1.xml new file mode 100644 index 0000000000..6c72db378b --- /dev/null +++ b/src/cpu_map/x86_IvyBridge-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='IvyBridge-v1'> + <decode host='on' guest='off'/> + <model name='IvyBridge'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_IvyBridge-v2.xml b/src/cpu_map/x86_IvyBridge-v2.xml new file mode 100644 index 0000000000..e5dae3095a --- /dev/null +++ b/src/cpu_map/x86_IvyBridge-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='IvyBridge-v2'> + <decode host='on' guest='off'/> + <model name='IvyBridge-IBRS'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml index 0a31450732..c2a10377e5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>IvyBridge</model> + <model>IvyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='58' stepping='9'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml index 126eb09786..88459cdf90 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>IvyBridge</model> + <model>IvyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='58' stepping='9'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml index 0a31450732..c2a10377e5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>IvyBridge</model> + <model>IvyBridge-v1</model> <vendor>Intel</vendor> <signature family='6' model='58' stepping='9'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index b44ea2611d..91470f547c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -496,15 +496,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 799996be48..ea9d251170 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -852,14 +852,14 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -867,6 +867,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 252f6afa18..5595aa189f 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -495,15 +495,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index beaa1dafbd..67e9581392 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -505,15 +505,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 36163763f8..dece2c5a51 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -884,14 +884,14 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -899,6 +899,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index eed3864bb1..b20142b754 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -504,15 +504,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index c3b4c79732..20cf24f7d2 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -569,15 +569,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index d584638f33..8c105600d1 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -992,14 +992,14 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -1007,6 +1007,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 5bb327039d..d04712fac0 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -568,15 +568,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 5d5fbc9c31..fcb4bc875c 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -566,15 +566,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 5165e04d78..89d88b5ba6 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -990,14 +990,14 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -1005,6 +1005,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index d1cf0e9702..dd65742683 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -565,15 +565,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 758066b64b..7a8c833ffb 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -593,15 +593,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index ed7c6225c0..e180310c57 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1022,14 +1022,14 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -1037,6 +1037,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 8cde45efa8..0e27307188 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -592,15 +592,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 64b5033873..63b5f3daeb 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -560,15 +560,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 4bebb680d0..f2f45a3159 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -970,14 +970,14 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='avx'/> <feature name='f16c'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='avx'/> <feature name='f16c'/> @@ -985,6 +985,21 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='avx'/> + <feature name='f16c'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f4c7fb0089..4596b3cfaa 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -559,15 +559,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index a0fb5fad67..eb02099bdd 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -565,15 +565,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 17e4b135bb..8833bf346f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -795,17 +795,28 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 17e4b135bb..8833bf346f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -795,17 +795,28 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 17bd1d5c75..abb210a30b 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -564,15 +564,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 9e69036f90..283617171c 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -565,15 +565,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index 3192c6cd1f..65e487ff9e 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -795,17 +795,28 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 79e5eeddc6..0760bdaac4 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -564,15 +564,24 @@ <feature name='vaes'/> <feature name='vpclmulqdq'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> 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 dfbaeb4d7a..e1d63a9007 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -703,15 +703,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> 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 035eb24b03..edd510b459 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -777,17 +777,28 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 13aa743b8a..db88c10e02 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -702,15 +702,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> 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 649abc64fc..32ca16ad7a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -704,15 +704,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> 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 9451fc7a44..bbedbc97e8 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -766,17 +766,28 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index b8d4756e68..dbb2f570c4 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -703,15 +703,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index dfcacf6e6f..1bb022ed96 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -704,15 +704,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 17b0727063..36e94c5332 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -732,15 +732,24 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index b378b91201..1f322d41c3 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -703,15 +703,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index e48cdd2a2e..1a646e25eb 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -737,15 +737,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 08d7cc0ca7..5ed8b25139 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -757,15 +757,24 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 684c342df6..fa46dd5393 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -736,15 +736,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 2d670ffaf4..3cfbed919a 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -737,15 +737,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 9823a24b7d..f6f461bbf4 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -757,15 +757,24 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='tsc-deadline'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index ce834cb4d5..f2f765ade9 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -736,15 +736,24 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v1'>IvyBridge</model> <blockers model='IvyBridge'> <feature name='erms'/> </blockers> - <model usable='no' vendor='Intel'>IvyBridge-IBRS</model> + <model usable='no' vendor='Intel' canonical='IvyBridge-v2'>IvyBridge-IBRS</model> <blockers model='IvyBridge-IBRS'> <feature name='erms'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v1</model> + <blockers model='IvyBridge-v1'> + <feature name='erms'/> + </blockers> + <model usable='no' vendor='Intel'>IvyBridge-v2</model> + <blockers model='IvyBridge-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Intel'>Nehalem</model> <model usable='no' vendor='Intel'>Nehalem-IBRS</model> <blockers model='Nehalem-IBRS'> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Westmere-v2 defined as Westmere-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 2 ++ src/cpu_map/meson.build | 2 ++ src/cpu_map/x86_Westmere-v1.xml | 6 ++++++ src/cpu_map/x86_Westmere-v2.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml | 2 +- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 9 +++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 9 +++++++-- 49 files changed, 301 insertions(+), 85 deletions(-) create mode 100644 src/cpu_map/x86_Westmere-v1.xml create mode 100644 src/cpu_map/x86_Westmere-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 0b003b7e5c..1160a99ccf 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -33,6 +33,8 @@ <include filename='x86_Nehalem-IBRS.xml'/> <include filename='x86_Westmere.xml'/> <include filename='x86_Westmere-IBRS.xml'/> + <include filename='x86_Westmere-v1.xml'/> + <include filename='x86_Westmere-v2.xml'/> <include filename='x86_SandyBridge.xml'/> <include filename='x86_SandyBridge-IBRS.xml'/> <include filename='x86_SandyBridge-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index de1eb8efbd..474f43fad5 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -129,6 +129,8 @@ cpumap_data = [ 'x86_Snowridge.xml', 'x86_vendors.xml', 'x86_Westmere-IBRS.xml', + 'x86_Westmere-v1.xml', + 'x86_Westmere-v2.xml', 'x86_Westmere.xml', ] diff --git a/src/cpu_map/x86_Westmere-v1.xml b/src/cpu_map/x86_Westmere-v1.xml new file mode 100644 index 0000000000..e7554ba309 --- /dev/null +++ b/src/cpu_map/x86_Westmere-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Westmere-v1'> + <decode host='on' guest='off'/> + <model name='Westmere'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Westmere-v2.xml b/src/cpu_map/x86_Westmere-v2.xml new file mode 100644 index 0000000000..6107303790 --- /dev/null +++ b/src/cpu_map/x86_Westmere-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Westmere-v2'> + <decode host='on' guest='off'/> + <model name='Westmere-IBRS'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml index c830b8a649..98718a36a5 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Westmere-IBRS</model> + <model>Westmere-v2</model> <vendor>Intel</vendor> <signature family='6' model='134' stepping='5'/> <feature name='pclmuldq'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml index c074a5c6ec..6d43353c87 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Westmere</model> + <model>Westmere-v1</model> <vendor>Intel</vendor> <signature family='6' model='37' stepping='2'/> <feature name='pclmuldq'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml index 0e994e0623..43e0257a3f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Westmere</model> + <model>Westmere-v1</model> <vendor>Intel</vendor> <signature family='6' model='69' stepping='1'/> <feature name='pclmuldq'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml index 728c9c4264..fb4f1efc92 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Westmere</model> + <model>Westmere-v1</model> <vendor>Intel</vendor> <signature family='6' model='47' stepping='2'/> <feature name='pclmuldq'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml index 728c9c4264..fb4f1efc92 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Westmere</model> + <model>Westmere-v1</model> <vendor>Intel</vendor> <signature family='6' model='47' stepping='2'/> <feature name='pclmuldq'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index fef8d6b7e6..f28fc3588a 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -724,11 +724,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index ef6c42b26e..1a6022cf18 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -1240,11 +1240,16 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index bf133ee52f..0ddb5d7411 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -723,11 +723,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 4d70c4dff3..47fb80dbb5 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -733,11 +733,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 51c450070e..b0320b8bb0 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -1272,11 +1272,16 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 5aa253d292..0a04364785 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -732,11 +732,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 8331b137a4..2ab2725264 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -828,11 +828,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index ffb6f8b8f5..01e3243839 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1437,11 +1437,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 5d9e5e7d0a..a33227c9e7 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -827,11 +827,16 @@ <feature name='spec-ctrl'/> <feature name='split-lock-detect'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 8b5d68d86f..32d9396f7e 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -834,11 +834,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 99aee06e01..4373491a96 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1453,11 +1453,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index eecf62e23c..df66a60087 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -833,11 +833,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 1594090e93..8e6af2e612 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -861,11 +861,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 5cbef5a3d9..f3a17b9cdc 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1480,11 +1480,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 7686d541af..35c97e9653 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -860,11 +860,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 64f907d402..d9941ac903 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -828,11 +828,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 2c3d3c6831..2cb556304c 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1428,11 +1428,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index d44bbf5916..08f5223723 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -827,11 +827,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 0c80394deb..21e3d6cdd2 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -833,11 +833,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index c0bccf6d63..8efb91b8d2 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -1177,11 +1177,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index c0bccf6d63..8efb91b8d2 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1177,11 +1177,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 495ff2a7a6..244c60638b 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -832,11 +832,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 14b575174e..4da4c9502b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -915,11 +915,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index 5ea1d67be6..7a14b52628 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1273,11 +1273,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 910375f2f9..bb63910270 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -914,11 +914,16 @@ <feature name='movdiri'/> <feature name='spec-ctrl'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> 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 76d4068514..0590aadff0 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -1104,11 +1104,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> 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 85c1c55285..ddf0837a3e 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1231,11 +1231,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 31faf3b348..cb7724308b 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -1103,11 +1103,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> 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 b19817918f..ece4b0e9df 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -1105,11 +1105,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> 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 f5c4c5cde5..828cbe069a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1212,11 +1212,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 382c098a1a..da9d657b8e 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -1104,11 +1104,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 5e85710109..ac6b431057 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -1105,11 +1105,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 003aca6d5a..a63f5a5060 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -1147,11 +1147,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index be10184da3..ac2c018ccf 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -1104,11 +1104,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index eba43c60e4..cf24a98793 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -1241,11 +1241,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 58bb4f9db6..c396fb8eed 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1252,11 +1252,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index e548534e1f..d6905fe903 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -1240,11 +1240,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 5be6724161..21affa5e67 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -1241,11 +1241,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 1eec80af8d..c6f1732275 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1252,11 +1252,16 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>athlon</model> <model usable='yes' vendor='Intel'>core2duo</model> <model usable='yes' vendor='Intel'>coreduo</model> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 0716a44ed5..ca506076a8 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -1240,11 +1240,16 @@ <feature name='spec-ctrl'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='Intel'>Westmere</model> - <model usable='no' vendor='Intel'>Westmere-IBRS</model> + <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model> + <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model> <blockers model='Westmere-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Westmere-v1</model> + <model usable='no' vendor='Intel'>Westmere-v2</model> + <blockers model='Westmere-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='AMD'>athlon</model> <blockers model='athlon'> <feature name='3dnow'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities - CPU models are no longer canonicalized in post-parse src/cpu_map/index.xml | 2 + src/cpu_map/meson.build | 2 + src/cpu_map/x86_EPYC-Milan-v1.xml | 6 ++ src/cpu_map/x86_EPYC-Milan-v2.xml | 99 +++++++++++++++++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 33 ++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 33 ++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 32 +++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 31 +++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 31 +++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 11 ++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 27 ++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 27 ++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 11 ++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 26 ++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 11 ++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 46 ++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 44 ++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 44 ++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 44 ++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 27 ++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 44 ++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 27 ++++- 41 files changed, 958 insertions(+), 37 deletions(-) create mode 100644 src/cpu_map/x86_EPYC-Milan-v1.xml create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 1aa1d52f7a..5a1a4aa691 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -124,6 +124,8 @@ <include filename='x86_EPYC-IBPB.xml'/> <include filename='x86_EPYC-Rome.xml'/> <include filename='x86_EPYC-Milan.xml'/> + <include filename='x86_EPYC-Milan-v1.xml'/> + <include filename='x86_EPYC-Milan-v2.xml'/> <include filename='x86_EPYC-Genoa.xml'/> </group> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 9accba9936..5baf6543dd 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -51,6 +51,8 @@ cpumap_data = [ 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', 'x86_EPYC-Genoa.xml', + 'x86_EPYC-Milan-v1.xml', + 'x86_EPYC-Milan-v2.xml', 'x86_EPYC-Milan.xml', 'x86_EPYC-Rome.xml', 'x86_features.xml', diff --git a/src/cpu_map/x86_EPYC-Milan-v1.xml b/src/cpu_map/x86_EPYC-Milan-v1.xml new file mode 100644 index 0000000000..ac1e9f7fb4 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Milan-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='EPYC-Milan-v1'> + <decode host='on' guest='off'/> + <model name='EPYC-Milan'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-Milan-v2.xml b/src/cpu_map/x86_EPYC-Milan-v2.xml new file mode 100644 index 0000000000..1a8969ef34 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Milan-v2.xml @@ -0,0 +1,99 @@ +<cpus> + <model name='EPYC-Milan-v2'> + <decode host='on' guest='off'/> + <signature family='25' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrm'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lfence-always-serializing'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='no-nested-data-bp'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='stibp-always-on'/> + <feature name='svm'/> + <feature name='svme-addr-chk'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 589daac924..7f55b528e6 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -259,7 +259,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -268,6 +268,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 4678c6dd21..4de66b9fc1 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -466,7 +466,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -497,6 +497,37 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='svme-addr-chk'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 50d2aa6690..5c9d38ca08 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -258,7 +258,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -267,6 +267,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 7ae20c1b2a..9d6d6ccdf7 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -297,7 +297,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -306,6 +306,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index e1a4dbbbf2..ab6728b6f3 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -531,7 +531,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -562,6 +562,37 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='svme-addr-chk'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index a1e9e227f7..ea112f1748 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -296,7 +296,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -305,6 +305,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index da015ee336..dec6db99f0 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -294,7 +294,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -303,6 +303,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 1734f2a315..8b15c74e33 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -530,7 +530,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -560,6 +560,36 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='umip'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 342cfcb031..b136ce847c 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -293,7 +293,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -302,6 +302,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 9f98e0ecf3..8a5dd3af81 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -295,7 +295,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -304,6 +304,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 0b852acde0..cee1f740d4 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -531,7 +531,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -560,6 +560,35 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 2f6bfe14a5..15be5d34e0 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -294,7 +294,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -303,6 +303,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 2a07eb4442..e70d3c7498 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -296,7 +296,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -305,6 +305,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index da183f31f2..676d13fb3b 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -531,7 +531,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -560,6 +560,35 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 4d54e4f5f4..6859c4de66 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -295,7 +295,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -304,6 +304,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 19adea1842..a2be591f11 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -301,7 +301,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -310,6 +310,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index c223cb4d79..cecfdf6b5e 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -436,7 +436,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -461,6 +461,31 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index c223cb4d79..cecfdf6b5e 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -436,7 +436,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -461,6 +461,31 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fsrm'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index a557ffa7da..2aecbb33bc 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -300,7 +300,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -309,6 +309,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 0aa4cbc785..2640491c43 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -301,7 +301,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -310,6 +310,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index c88b68e566..489085a666 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -440,7 +440,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='3dnowprefetch'/> <feature name='amd-ssbd'/> @@ -464,6 +464,30 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='3dnowprefetch'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='rdpid'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='wbnoinvd'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 6815648b70..a8027a43e9 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -300,7 +300,7 @@ <model usable='yes' vendor='Hygon'>Dhyana</model> <model usable='yes' vendor='AMD'>EPYC</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -309,6 +309,15 @@ <feature name='pcid'/> <feature name='pku'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + </blockers> <model usable='yes' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> 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 67cd483a1f..aa179c38f6 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -335,7 +335,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -345,6 +345,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> 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 04dcadb6e5..cac6a73071 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -401,7 +401,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='amd-ssbd'/> <feature name='amd-stibp'/> @@ -420,6 +420,50 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lfence-always-serializing'/> + <feature name='misalignsse'/> + <feature name='no-nested-data-bp'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='stibp-always-on'/> + <feature name='topoext'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 5355c72af5..1f996902da 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -334,7 +334,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -344,6 +344,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> 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 fd02445887..9038f79bb2 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -336,7 +336,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -346,6 +346,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> 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 0ec33d8429..7574fb3d27 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -397,7 +397,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='amd-ssbd'/> <feature name='amd-stibp'/> @@ -415,6 +415,48 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lfence-always-serializing'/> + <feature name='misalignsse'/> + <feature name='no-nested-data-bp'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='stibp-always-on'/> + <feature name='topoext'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index a23befe2f1..5b06b58bdd 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -335,7 +335,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -345,6 +345,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index b023d610ef..1f01a23a96 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -336,7 +336,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -346,6 +346,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 98a41dd8b4..72a66a62e3 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -381,7 +381,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='amd-ssbd'/> <feature name='amd-stibp'/> @@ -399,6 +399,48 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lfence-always-serializing'/> + <feature name='misalignsse'/> + <feature name='no-nested-data-bp'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='stibp-always-on'/> + <feature name='topoext'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 835512bef6..941fb3bf31 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -335,7 +335,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -345,6 +345,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 2edf598fe3..7f1da49da1 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -340,7 +340,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -350,6 +350,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index f662f2877c..529b90c1fe 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -380,7 +380,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='amd-ssbd'/> <feature name='amd-stibp'/> @@ -398,6 +398,48 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lfence-always-serializing'/> + <feature name='misalignsse'/> + <feature name='no-nested-data-bp'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='stibp-always-on'/> + <feature name='topoext'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index e21869ffbf..ba51b7cfc8 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -339,7 +339,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -349,6 +349,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 2eef3931d4..ad25b70d3a 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -340,7 +340,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -350,6 +350,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index f1da5250cf..b627dc398f 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -380,7 +380,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='amd-ssbd'/> <feature name='amd-stibp'/> @@ -398,6 +398,48 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='amd-ssbd'/> + <feature name='amd-stibp'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='lfence-always-serializing'/> + <feature name='misalignsse'/> + <feature name='no-nested-data-bp'/> + <feature name='nrip-save'/> + <feature name='null-sel-clr-base'/> + <feature name='osvw'/> + <feature name='pcid'/> + <feature name='perfctr_core'/> + <feature name='stibp-always-on'/> + <feature name='topoext'/> + <feature name='vpclmulqdq'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='amd-stibp'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index c2ba1fde1b..d1a71cf441 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -339,7 +339,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> - <model usable='no' vendor='AMD'>EPYC-Milan</model> + <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> <feature name='fsrm'/> @@ -349,6 +349,31 @@ <feature name='pku'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v1</model> + <blockers model='EPYC-Milan-v1'> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-Milan-v2</model> + <blockers model='EPYC-Milan-v2'> + <feature name='amd-psfd'/> + <feature name='erms'/> + <feature name='fsrm'/> + <feature name='ibrs'/> + <feature name='invpcid'/> + <feature name='no-nested-data-bp'/> + <feature name='pcid'/> + <feature name='pku'/> + <feature name='stibp-always-on'/> + <feature name='vaes'/> + <feature name='vpclmulqdq'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='AMD'>EPYC-Rome</model> <blockers model='EPYC-Rome'> <feature name='xsaves'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - EPYC-v2 defined as EPYC-IBPB - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities - CPU models are no longer canonicalized in post-parse src/cpu_map/index.xml | 4 + src/cpu_map/meson.build | 4 + src/cpu_map/x86_EPYC-v1.xml | 6 ++ src/cpu_map/x86_EPYC-v2.xml | 6 ++ src/cpu_map/x86_EPYC-v3.xml | 79 +++++++++++++++++++ src/cpu_map/x86_EPYC-v4.xml | 79 +++++++++++++++++++ .../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 2 +- ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +- ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 58 +++++++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 +- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 46 ++++++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 46 ++++++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 46 ++++++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 14 +++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 53 ++++++++++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 14 +++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 14 +++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 49 +++++++++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 49 +++++++++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 49 +++++++++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 14 +++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 49 +++++++++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 14 +++- 49 files changed, 1088 insertions(+), 89 deletions(-) create mode 100644 src/cpu_map/x86_EPYC-v1.xml create mode 100644 src/cpu_map/x86_EPYC-v2.xml create mode 100644 src/cpu_map/x86_EPYC-v3.xml create mode 100644 src/cpu_map/x86_EPYC-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 9ea2b86bf7..182f78a31c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -122,6 +122,10 @@ <include filename='x86_Opteron_G5.xml'/> <include filename='x86_EPYC.xml'/> <include filename='x86_EPYC-IBPB.xml'/> + <include filename='x86_EPYC-v1.xml'/> + <include filename='x86_EPYC-v2.xml'/> + <include filename='x86_EPYC-v3.xml'/> + <include filename='x86_EPYC-v4.xml'/> <include filename='x86_EPYC-Rome.xml'/> <include filename='x86_EPYC-Rome-v1.xml'/> <include filename='x86_EPYC-Rome-v2.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 912db3d2de..c7a7fc3c52 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -49,6 +49,10 @@ cpumap_data = [ 'x86_cpu64-rhel6.xml', 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', + 'x86_EPYC-v1.xml', + 'x86_EPYC-v2.xml', + 'x86_EPYC-v3.xml', + 'x86_EPYC-v4.xml', 'x86_EPYC.xml', 'x86_EPYC-Genoa.xml', 'x86_EPYC-Milan-v1.xml', diff --git a/src/cpu_map/x86_EPYC-v1.xml b/src/cpu_map/x86_EPYC-v1.xml new file mode 100644 index 0000000000..815a10d67e --- /dev/null +++ b/src/cpu_map/x86_EPYC-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='EPYC-v1'> + <decode host='on' guest='off'/> + <model name='EPYC'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-v2.xml b/src/cpu_map/x86_EPYC-v2.xml new file mode 100644 index 0000000000..a4e97e7cb6 --- /dev/null +++ b/src/cpu_map/x86_EPYC-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='EPYC-v2'> + <decode host='on' guest='off'/> + <model name='EPYC-IBPB'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-v3.xml b/src/cpu_map/x86_EPYC-v3.xml new file mode 100644 index 0000000000..e8efea7406 --- /dev/null +++ b/src/cpu_map/x86_EPYC-v3.xml @@ -0,0 +1,79 @@ +<cpus> + <model name='EPYC-v3'> + <decode host='on' guest='off'/> + <signature family='23' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='vme'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-v4.xml b/src/cpu_map/x86_EPYC-v4.xml new file mode 100644 index 0000000000..c5701af1ca --- /dev/null +++ b/src/cpu_map/x86_EPYC-v4.xml @@ -0,0 +1,79 @@ +<cpus> + <model name='EPYC-v4'> + <decode host='on' guest='off'/> + <signature family='23' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='npt'/> + <feature name='nrip-save'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='vme'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml index 1c3d935532..3646ed05a1 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>EPYC</model> + <model>EPYC-v1</model> <vendor>AMD</vendor> <signature family='23' model='1' stepping='2'/> <feature name='monitor'/> diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml index a438ac4db1..89a4c80691 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml @@ -1,29 +1,23 @@ <cpu> <arch>x86_64</arch> - <model>EPYC-IBPB</model> + <model>EPYC-v4</model> <vendor>AMD</vendor> <signature family='23' model='1' stepping='2'/> <feature name='monitor'/> <feature name='osxsave'/> <feature name='ht'/> - <feature name='xsaves'/> <feature name='cmp_legacy'/> <feature name='extapic'/> <feature name='skinit'/> <feature name='wdt'/> <feature name='tce'/> <feature name='topoext'/> - <feature name='perfctr_core'/> <feature name='perfctr_nb'/> <feature name='overflow-recov'/> <feature name='succor'/> <feature name='invtsc'/> - <feature name='clzero'/> - <feature name='xsaveerptr'/> - <feature name='npt'/> <feature name='lbrv'/> <feature name='svm-lock'/> - <feature name='nrip-save'/> <feature name='tsc-scale'/> <feature name='vmcb-clean'/> <feature name='flushbyasid'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml index f711efd9f9..dd4b51796d 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>EPYC</model> + <model>EPYC-v1</model> <vendor>AMD</vendor> <signature family='23' model='1' stepping='1'/> <feature name='monitor'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 382a47b1eb..ce31b01600 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -257,10 +257,13 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index f8669af5d0..4e3e6c194f 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -432,7 +432,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -448,7 +448,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -515,6 +515,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 6b9bddd8b8..bf17e1504c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -256,10 +256,13 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='yes' vendor='AMD' canonical='EPYC-Rome-v1'>EPYC-Rome</model> <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b63f66fb0b..2d612e907f 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -257,8 +257,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -283,6 +283,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 97fb021c94..51ed9249c8 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -433,7 +433,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -449,7 +449,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -605,6 +605,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index fe6640357e..7265521af9 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -256,8 +256,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -282,6 +282,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index a31f32d941..f560160fe8 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -295,8 +295,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -321,6 +321,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 83f3d85fbf..9e7d561505 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -498,7 +498,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -514,7 +514,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -670,6 +670,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 55490e84e2..7f688a81d2 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -294,8 +294,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -320,6 +320,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 7c95a85710..50ec29a6e9 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -292,8 +292,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -318,6 +318,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 2bb7c6d3f0..cbec1913d2 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -497,7 +497,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -513,7 +513,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -667,6 +667,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 0bc265f553..08c95bcb4e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -291,8 +291,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -317,6 +317,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 7ca80c159a..378b628d4c 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -293,8 +293,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -319,6 +319,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index a69abcfb0c..ae042caffe 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -498,7 +498,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -514,7 +514,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -663,6 +663,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 09a9ea1792..50d86eac32 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -292,8 +292,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -318,6 +318,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index a9bf1e222d..174df21fb9 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -294,8 +294,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -320,6 +320,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 94744c83d4..cc90068b2a 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -498,7 +498,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -514,7 +514,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -663,6 +663,60 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='clzero'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 3698fa6b95..b632a42369 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -293,8 +293,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -319,6 +319,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index b628d0fbd7..b001cb4a5e 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -299,8 +299,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -325,6 +325,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 80e2034cdc..880699c148 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -411,7 +411,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -423,7 +423,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -548,6 +548,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 80e2034cdc..880699c148 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -411,7 +411,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -423,7 +423,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -548,6 +548,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index a1235cc34f..10812e4a76 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -298,8 +298,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -324,6 +324,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 8aec71596b..528ea3e587 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -299,8 +299,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -325,6 +325,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index ea81ce32d4..7f84682bce 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -415,7 +415,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -427,7 +427,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='3dnowprefetch'/> <feature name='fxsr_opt'/> @@ -550,6 +550,48 @@ <feature name='xsaveerptr'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='3dnowprefetch'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='3dnowprefetch'/> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='hle'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 8502f47d88..09226bc699 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -298,8 +298,8 @@ <feature name='taa-no'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -324,6 +324,9 @@ <blockers model='EPYC-Rome-v2'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='yes' vendor='AMD'>EPYC-v3</model> <model usable='no' vendor='Intel' canonical='Haswell-v1'>Haswell</model> <blockers model='Haswell'> <feature name='erms'/> 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 d18568f3a6..f039bc6615 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -303,7 +303,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -334,7 +334,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -392,6 +392,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 66efea8372..b709406703 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -340,7 +340,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='fxsr_opt'/> <feature name='misalignsse'/> @@ -390,7 +390,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='fxsr_opt'/> <feature name='ibpb'/> @@ -544,6 +544,55 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='sha-ni'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index e32562a964..3af606f714 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -302,7 +302,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -333,7 +333,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -391,6 +391,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 e92c85d74f..ce59c65721 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -304,7 +304,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -335,7 +335,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -393,6 +393,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> 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 fdb16866fa..a3bdc02c81 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -339,7 +339,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='fxsr_opt'/> <feature name='misalignsse'/> @@ -387,7 +387,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='fxsr_opt'/> <feature name='ibpb'/> @@ -532,6 +532,51 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 53dd6165f1..6f903dda95 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -303,7 +303,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -334,7 +334,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -392,6 +392,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index a1710315a0..83b1f419db 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -304,7 +304,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -335,7 +335,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -393,6 +393,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 974a596dbb..46841fcb2d 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -323,7 +323,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='fxsr_opt'/> <feature name='misalignsse'/> @@ -371,7 +371,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='fxsr_opt'/> <feature name='ibpb'/> @@ -516,6 +516,51 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 077fbfa679..7522de5d44 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -303,7 +303,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -334,7 +334,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -392,6 +392,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index fe3ddbc371..4c348b0959 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -308,7 +308,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -339,7 +339,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -397,6 +397,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 9bef84873c..c2fa795f1e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -322,7 +322,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='fxsr_opt'/> <feature name='misalignsse'/> @@ -370,7 +370,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='fxsr_opt'/> <feature name='ibpb'/> @@ -515,6 +515,51 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index a9bd9b8a89..2ad2bd6ba1 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -307,7 +307,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -338,7 +338,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -396,6 +396,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 1df9ba1786..68bb1b3572 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -308,7 +308,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -339,7 +339,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -397,6 +397,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index be3a49c060..66547e4adc 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -322,7 +322,7 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='AMD'>EPYC</model> + <model usable='no' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <blockers model='EPYC'> <feature name='fxsr_opt'/> <feature name='misalignsse'/> @@ -370,7 +370,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='AMD'>EPYC-IBPB</model> + <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <blockers model='EPYC-IBPB'> <feature name='fxsr_opt'/> <feature name='ibpb'/> @@ -515,6 +515,51 @@ <feature name='topoext'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='AMD'>EPYC-v1</model> + <blockers model='EPYC-v1'> + <feature name='fxsr_opt'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v2</model> + <blockers model='EPYC-v2'> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='topoext'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='clzero'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='misalignsse'/> + <feature name='nrip-save'/> + <feature name='osvw'/> + <feature name='perfctr_core'/> + <feature name='topoext'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index ae1d858cd9..f757e52446 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -307,7 +307,7 @@ <feature name='xsaves'/> </blockers> <model usable='yes' vendor='Hygon'>Dhyana</model> - <model usable='yes' vendor='AMD'>EPYC</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> <model usable='no' vendor='AMD'>EPYC-Genoa</model> <blockers model='EPYC-Genoa'> <feature name='amd-psfd'/> @@ -338,7 +338,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='yes' vendor='AMD'>EPYC-IBPB</model> + <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model> <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model> <blockers model='EPYC-Milan'> <feature name='erms'/> @@ -396,6 +396,16 @@ <blockers model='EPYC-Rome-v4'> <feature name='ibrs'/> </blockers> + <model usable='yes' vendor='AMD'>EPYC-v1</model> + <model usable='yes' vendor='AMD'>EPYC-v2</model> + <model usable='no' vendor='AMD'>EPYC-v3</model> + <blockers model='EPYC-v3'> + <feature name='xsaves'/> + </blockers> + <model usable='no' vendor='AMD'>EPYC-v4</model> + <blockers model='EPYC-v4'> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='GraniteRapids-v1'>GraniteRapids</model> <blockers model='GraniteRapids'> <feature name='amx-bf16'/> -- 2.47.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - new patch src/cpu_map/index.xml | 4 + src/cpu_map/x86_Denverton-v1.xml | 6 + src/cpu_map/x86_Denverton-v2.xml | 137 +++++++++++++++++ src/cpu_map/x86_Denverton-v3.xml | 139 ++++++++++++++++++ src/cpu_map/x86_Denverton.xml | 138 +++++++++++++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 42 ++++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 17 +++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 42 ++++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 17 +++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 22 +++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 22 +++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 22 +++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 22 +++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 22 +++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 57 +++++++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 22 +++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 57 +++++++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 22 +++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 23 +++ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 41 ++++++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 23 +++ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 23 +++ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 37 +++++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 33 +++++ tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 33 +++++ tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 23 +++ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 33 +++++ tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 23 +++ 45 files changed, 1646 insertions(+) create mode 100644 src/cpu_map/x86_Denverton-v1.xml create mode 100644 src/cpu_map/x86_Denverton-v2.xml create mode 100644 src/cpu_map/x86_Denverton-v3.xml create mode 100644 src/cpu_map/x86_Denverton.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 3d407856f2..8ab5e66a2f 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -110,6 +110,10 @@ <include filename='x86_GraniteRapids-v1.xml'/> <include filename='x86_SierraForest.xml'/> <include filename='x86_SierraForest-v1.xml'/> + <include filename='x86_Denverton.xml'/> + <include filename='x86_Denverton-v1.xml'/> + <include filename='x86_Denverton-v2.xml'/> + <include filename='x86_Denverton-v3.xml'/> </group> <group name='AMD CPU models'> diff --git a/src/cpu_map/x86_Denverton-v1.xml b/src/cpu_map/x86_Denverton-v1.xml new file mode 100644 index 0000000000..2f9940c4aa --- /dev/null +++ b/src/cpu_map/x86_Denverton-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Denverton-v1'> + <decode host='on' guest='off'/> + <model name='Denverton'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Denverton-v2.xml b/src/cpu_map/x86_Denverton-v2.xml new file mode 100644 index 0000000000..b16c28dda5 --- /dev/null +++ b/src/cpu_map/x86_Denverton-v2.xml @@ -0,0 +1,137 @@ +<cpus> + <model name='Denverton-v2'> + <decode host='on' guest='off'/> + <signature family='6' model='95'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Denverton-v3.xml b/src/cpu_map/x86_Denverton-v3.xml new file mode 100644 index 0000000000..92c6777125 --- /dev/null +++ b/src/cpu_map/x86_Denverton-v3.xml @@ -0,0 +1,139 @@ +<cpus> + <model name='Denverton-v3'> + <decode host='on' guest='off'/> + <signature family='6' model='95'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='vmx-xsaves'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Denverton.xml b/src/cpu_map/x86_Denverton.xml new file mode 100644 index 0000000000..2ec865156c --- /dev/null +++ b/src/cpu_map/x86_Denverton.xml @@ -0,0 +1,138 @@ +<cpus> + <model name='Denverton'> + <decode host='on' guest='on'/> + <signature family='6' model='95'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-pml'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-exit'/> + <feature name='vmx-rdseed-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <feature name='vmx-shadow-vmcs'/> + <feature name='vmx-store-lma'/> + <feature name='vmx-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-unrestricted-guest'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vmfunc'/> + <feature name='vmx-vmwrite-vmexit-fields'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 98e582a3fa..71899aac51 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -256,6 +256,23 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index 117afc9e3d..286b8e966d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -416,6 +416,48 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 4fdcad62a0..c81560572c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -255,6 +255,23 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b87ee141c5..c8b6a1b6d4 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -256,6 +256,23 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index e3e8183706..8eb428012a 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -417,6 +417,48 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 061443eed5..49a1404ede 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -255,6 +255,23 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 1b8adc0a72..4b4f03331f 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -294,6 +294,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index d701015606..8b14fc2b24 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -482,6 +482,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 29d0301445..4130b22e04 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -293,6 +293,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 0f64e1e753..5c2eb2c3eb 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -291,6 +291,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 0d362cdc6e..ea7836d9b1 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -481,6 +481,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index b52eaf845a..61f7811e55 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -290,6 +290,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index bb10641bad..f86ea024e3 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -292,6 +292,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index a1815a02d4..b11529758a 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -482,6 +482,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 07066fa172..37f3097940 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -291,6 +291,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index f9cac9b1b1..363b9444d0 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -293,6 +293,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 7dfd3fd953..0b296c6b20 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -482,6 +482,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 9f274cbe82..74d06d4c08 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -292,6 +292,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index db43a92b4a..e1c4fb3ca4 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -298,6 +298,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index a698de759e..56788953c0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -399,6 +399,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index a698de759e..56788953c0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -399,6 +399,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index cee9d73d5f..0881e58bae 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -297,6 +297,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 04b7da20dd..fe73e69a73 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -298,6 +298,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index dd94e659ff..355af77b04 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -403,6 +403,63 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='3dnowprefetch'/> + <feature name='arch-capabilities'/> + <feature name='rdctl-no'/> + <feature name='rdseed'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 8aa2143683..3a35680d4c 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -297,6 +297,28 @@ <feature name='spec-ctrl'/> <feature name='taa-no'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='yes' vendor='Hygon'>Dhyana-v2</model> 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 29d516ff63..62bf217a54 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -302,6 +302,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</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 069bdcbc94..4dcffa7558 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -330,6 +330,47 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='arch-capabilities'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='arch-capabilities'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='arch-capabilities'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='arch-capabilities'/> + <feature name='sha-ni'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='fxsr_opt'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index a230a2871a..5a77b4389d 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -301,6 +301,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</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 802b2da614..defd5da379 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -303,6 +303,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</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 7820f8abf6..e15cef011a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -329,6 +329,43 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='fxsr_opt'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 1bcde20491..3de0cfdeef 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -302,6 +302,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 4e930aa816..79629685c7 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -303,6 +303,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index c5b9ae2c72..8ce52b6cd4 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -313,6 +313,39 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='fxsr_opt'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 3698ada044..d6eeed22c2 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -302,6 +302,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 7641d2a036..cafefd865e 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -307,6 +307,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index de8157fb95..d1faf67581 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -312,6 +312,39 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='fxsr_opt'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index d9aa3a5e7d..68dbbc8068 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -306,6 +306,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index 582b57b013..227ab2598a 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -307,6 +307,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 5bb387d434..2dde0dbc6d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -312,6 +312,39 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='arch-capabilities'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <blockers model='Dhyana'> <feature name='fxsr_opt'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 0d1837bc2c..1681f4624c 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -306,6 +306,29 @@ <feature name='taa-no'/> <feature name='xsaves'/> </blockers> + <model usable='no' vendor='Intel' canonical='Denverton-v1'>Denverton</model> + <blockers model='Denverton'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v1</model> + <blockers model='Denverton-v1'> + <feature name='erms'/> + <feature name='mpx'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v2</model> + <blockers model='Denverton-v2'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Denverton-v3</model> + <blockers model='Denverton-v3'> + <feature name='erms'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='yes' vendor='Hygon' canonical='Dhyana-v1'>Dhyana</model> <model usable='yes' vendor='Hygon'>Dhyana-v1</model> <model usable='no' vendor='Hygon'>Dhyana-v2</model> -- 2.47.0