Allow for syntax <include filename="subdir/fooo.xml"/> to reference other files in the CPU database directory Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu/cpu_map.c | 87 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index d263eb8cdd..bcd3e55417 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -1,7 +1,7 @@ /* * cpu_map.c: internal functions for handling CPU mapping configuration * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,6 +70,84 @@ static int load(xmlXPathContextPtr ctxt, return ret; } +static int +cpuMapLoadInclude(const char *filename, + cpuMapLoadCallback cb, + void *data) +{ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + int ret = -1; + int element; + char *mapfile; + + if (!(mapfile = virFileFindResource(filename, + abs_topsrcdir "/src/cpu", + PKGDATADIR))) + return -1; + + VIR_DEBUG("Loading CPU map include from %s", mapfile); + + if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt))) + goto cleanup; + + ctxt->node = xmlDocGetRootElement(xml); + + for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { + if (load(ctxt, element, cb, data) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse CPU map '%s'"), mapfile); + goto cleanup; + } + } + + ret = 0; + + cleanup: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(mapfile); + + return ret; +} + + +static int +loadIncludes(xmlXPathContextPtr ctxt, + cpuMapLoadCallback callback, + void *data) +{ + int ret = -1; + xmlNodePtr ctxt_node; + xmlNodePtr *nodes = NULL; + int n; + size_t i; + + ctxt_node = ctxt->node; + + n = virXPathNodeSet("include", ctxt, &nodes); + if (n < 0) + goto cleanup; + + for (i = 0; i < n; i++) { + char *filename = virXMLPropString(nodes[i], "filename"); + VIR_DEBUG("Finding CPU map include '%s'", filename); + if (cpuMapLoadInclude(filename, callback, data) < 0) { + VIR_FREE(filename); + goto cleanup; + } + VIR_FREE(filename); + } + + ret = 0; + + cleanup: + ctxt->node = ctxt_node; + VIR_FREE(nodes); + + return ret; +} + int cpuMapLoad(const char *arch, cpuMapLoadCallback cb, @@ -88,7 +166,7 @@ int cpuMapLoad(const char *arch, PKGDATADIR))) return -1; - VIR_DEBUG("Loading CPU map from %s", mapfile); + VIR_DEBUG("Loading '%s' CPU map from %s", NULLSTR(arch), mapfile); if (arch == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -122,11 +200,14 @@ int cpuMapLoad(const char *arch, for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { if (load(ctxt, element, cb, data) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse CPU map for %s architecture"), arch); + _("cannot parse CPU map '%s'"), mapfile); goto cleanup; } } + if (loadIncludes(ctxt, cb, data) < 0) + goto cleanup; + ret = 0; cleanup: -- 2.17.1

Two pieces of code accidentally jumped to the wrong label when they failed causing incorrect cleanup, returning a partially initialized CPU model struct. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu/cpu_x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 809da94117..a045a8280c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1242,7 +1242,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid CPU signature family in model %s"), model->name); - goto cleanup; + goto error; } rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel); @@ -1250,7 +1250,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid CPU signature model in model %s"), model->name); - goto cleanup; + goto error; } model->signature = x86MakeSignature(sigFamily, sigModel, 0); -- 2.17.1

The x86 and ppc impls both duplicate some logic when parsing CPU features. Change the callback signature so that this duplication can be pushed up a level to common code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu/cpu_map.c | 98 +++++++++++++--------- src/cpu/cpu_map.h | 22 ++--- src/cpu/cpu_ppc64.c | 112 ++++++------------------- src/cpu/cpu_x86.c | 196 +++++++++++++------------------------------- 4 files changed, 143 insertions(+), 285 deletions(-) diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index bcd3e55417..400e6f1427 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -35,31 +35,47 @@ VIR_LOG_INIT("cpu.cpu_map"); -VIR_ENUM_IMPL(cpuMapElement, CPU_MAP_ELEMENT_LAST, - "vendor", - "feature", - "model") - - -static int load(xmlXPathContextPtr ctxt, - cpuMapElement element, - cpuMapLoadCallback callback, - void *data) +static int +loadData(const char *mapfile, + xmlXPathContextPtr ctxt, + const char *element, + cpuMapLoadCallback callback, + void *data) { int ret = -1; xmlNodePtr ctxt_node; xmlNodePtr *nodes = NULL; int n; + size_t i; + int rv; ctxt_node = ctxt->node; - n = virXPathNodeSet(cpuMapElementTypeToString(element), ctxt, &nodes); - if (n < 0) + if ((n = virXPathNodeSet(element, ctxt, &nodes)) < 0) goto cleanup; - if (n > 0 && - callback(element, ctxt, nodes, n, data) < 0) + if (n > 0 && !callback) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected element '%s' in CPU map '%s'"), element, mapfile); goto cleanup; + } + + for (i = 0; i < n; i++) { + xmlNodePtr old = ctxt->node; + char *name = virXMLPropString(nodes[i], "name"); + if (!name) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot find %s name in CPU map '%s'"), element, mapfile); + goto cleanup; + } + VIR_DEBUG("Load %s name %s", element, name); + ctxt->node = nodes[i]; + rv = callback(ctxt, name, data); + ctxt->node = old; + VIR_FREE(name); + if (rv < 0) + goto cleanup; + } ret = 0; @@ -72,13 +88,14 @@ static int load(xmlXPathContextPtr ctxt, static int cpuMapLoadInclude(const char *filename, - cpuMapLoadCallback cb, + cpuMapLoadCallback vendorCB, + cpuMapLoadCallback featureCB, + cpuMapLoadCallback modelCB, void *data) { xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; int ret = -1; - int element; char *mapfile; if (!(mapfile = virFileFindResource(filename, @@ -93,13 +110,14 @@ cpuMapLoadInclude(const char *filename, ctxt->node = xmlDocGetRootElement(xml); - for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { - if (load(ctxt, element, cb, data) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse CPU map '%s'"), mapfile); - goto cleanup; - } - } + if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0) + goto cleanup; + + if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0) + goto cleanup; + + if (loadData(mapfile, ctxt, "model", modelCB, data) < 0) + goto cleanup; ret = 0; @@ -114,7 +132,9 @@ cpuMapLoadInclude(const char *filename, static int loadIncludes(xmlXPathContextPtr ctxt, - cpuMapLoadCallback callback, + cpuMapLoadCallback vendorCB, + cpuMapLoadCallback featureCB, + cpuMapLoadCallback modelCB, void *data) { int ret = -1; @@ -132,7 +152,7 @@ loadIncludes(xmlXPathContextPtr ctxt, for (i = 0; i < n; i++) { char *filename = virXMLPropString(nodes[i], "filename"); VIR_DEBUG("Finding CPU map include '%s'", filename); - if (cpuMapLoadInclude(filename, callback, data) < 0) { + if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0) { VIR_FREE(filename); goto cleanup; } @@ -150,7 +170,9 @@ loadIncludes(xmlXPathContextPtr ctxt, int cpuMapLoad(const char *arch, - cpuMapLoadCallback cb, + cpuMapLoadCallback vendorCB, + cpuMapLoadCallback featureCB, + cpuMapLoadCallback modelCB, void *data) { xmlDocPtr xml = NULL; @@ -158,7 +180,6 @@ int cpuMapLoad(const char *arch, virBuffer buf = VIR_BUFFER_INITIALIZER; char *xpath = NULL; int ret = -1; - int element; char *mapfile; if (!(mapfile = virFileFindResource("cpu_map.xml", @@ -174,12 +195,6 @@ int cpuMapLoad(const char *arch, goto cleanup; } - if (cb == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("no callback provided")); - goto cleanup; - } - if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt))) goto cleanup; @@ -197,15 +212,16 @@ int cpuMapLoad(const char *arch, goto cleanup; } - for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { - if (load(ctxt, element, cb, data) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse CPU map '%s'"), mapfile); - goto cleanup; - } - } + if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0) + goto cleanup; + + if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0) + goto cleanup; + + if (loadData(mapfile, ctxt, "model", modelCB, data) < 0) + goto cleanup; - if (loadIncludes(ctxt, cb, data) < 0) + if (loadIncludes(ctxt, vendorCB, featureCB, modelCB, data) < 0) goto cleanup; ret = 0; diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index 0c7507e98f..4596987150 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -26,28 +26,16 @@ # include "virxml.h" - -typedef enum { - CPU_MAP_ELEMENT_VENDOR, - CPU_MAP_ELEMENT_FEATURE, - CPU_MAP_ELEMENT_MODEL, - - CPU_MAP_ELEMENT_LAST -} cpuMapElement; - -VIR_ENUM_DECL(cpuMapElement) - - typedef int -(*cpuMapLoadCallback) (cpuMapElement element, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n, +(*cpuMapLoadCallback) (xmlXPathContextPtr ctxt, + const char *name, void *data); int cpuMapLoad(const char *arch, - cpuMapLoadCallback cb, + cpuMapLoadCallback vendorCB, + cpuMapLoadCallback featureCB, + cpuMapLoadCallback modelCB, void *data); #endif /* __VIR_CPU_MAP_H__ */ diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index d562677fa3..75da5b77d8 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -281,21 +281,19 @@ ppc64MapFree(struct ppc64_map *map) VIR_FREE(map); } -static struct ppc64_vendor * -ppc64VendorParse(xmlXPathContextPtr ctxt, - struct ppc64_map *map) +static int +ppc64VendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + const char *name, + void *data) { + struct ppc64_map *map = data; struct ppc64_vendor *vendor; if (VIR_ALLOC(vendor) < 0) - return NULL; + return -1; - vendor->name = virXPathString("string(@name)", ctxt); - if (!vendor->name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing CPU vendor name")); + if (VIR_STRDUP(vendor->name, name) < 0) goto error; - } if (ppc64VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -303,57 +301,36 @@ ppc64VendorParse(xmlXPathContextPtr ctxt, goto error; } - return vendor; + if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) + goto error; + + return 0; error: ppc64VendorFree(vendor); - return NULL; + return -1; } static int -ppc64VendorsLoad(struct ppc64_map *map, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n) -{ - struct ppc64_vendor *vendor; - size_t i; - - if (VIR_ALLOC_N(map->vendors, n) < 0) - return -1; - - for (i = 0; i < n; i++) { - ctxt->node = nodes[i]; - if (!(vendor = ppc64VendorParse(ctxt, map))) - return -1; - map->vendors[map->nvendors++] = vendor; - } - - return 0; -} - - -static struct ppc64_model * ppc64ModelParse(xmlXPathContextPtr ctxt, - struct ppc64_map *map) + const char *name, + void *data) { + struct ppc64_map *map = data; struct ppc64_model *model; xmlNodePtr *nodes = NULL; char *vendor = NULL; unsigned long pvr; size_t i; int n; + int ret = -1; if (VIR_ALLOC(model) < 0) goto error; - model->name = virXPathString("string(@name)", ctxt); - if (!model->name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing CPU model name")); + if (VIR_STRDUP(model->name, name) < 0) goto error; - } if (ppc64ModelFind(map, model->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -410,63 +387,22 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, model->data.pvr[i].mask = pvr; } + if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) + goto error; + + ret = 0; + cleanup: VIR_FREE(vendor); VIR_FREE(nodes); - return model; + return ret; error: ppc64ModelFree(model); - model = NULL; goto cleanup; } -static int -ppc64ModelsLoad(struct ppc64_map *map, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n) -{ - struct ppc64_model *model; - size_t i; - - if (VIR_ALLOC_N(map->models, n) < 0) - return -1; - - for (i = 0; i < n; i++) { - ctxt->node = nodes[i]; - if (!(model = ppc64ModelParse(ctxt, map))) - return -1; - map->models[map->nmodels++] = model; - } - - return 0; -} - - -static int -ppc64MapLoadCallback(cpuMapElement element, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n, - void *data) -{ - struct ppc64_map *map = data; - - switch (element) { - case CPU_MAP_ELEMENT_VENDOR: - return ppc64VendorsLoad(map, ctxt, nodes, n); - case CPU_MAP_ELEMENT_MODEL: - return ppc64ModelsLoad(map, ctxt, nodes, n); - case CPU_MAP_ELEMENT_FEATURE: - case CPU_MAP_ELEMENT_LAST: - break; - } - - return 0; -} - static struct ppc64_map * ppc64LoadMap(void) { @@ -475,7 +411,7 @@ ppc64LoadMap(void) if (VIR_ALLOC(map) < 0) goto error; - if (cpuMapLoad("ppc64", ppc64MapLoadCallback, map) < 0) + if (cpuMapLoad("ppc64", ppc64VendorParse, NULL, ppc64ModelParse, map) < 0) goto error; return map; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a045a8280c..73af9d0885 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -712,22 +712,21 @@ x86VendorFind(virCPUx86MapPtr map, } -static virCPUx86VendorPtr +static int x86VendorParse(xmlXPathContextPtr ctxt, - virCPUx86MapPtr map) + const char *name, + void *data) { + virCPUx86MapPtr map = data; virCPUx86VendorPtr vendor = NULL; char *string = NULL; + int ret = -1; if (VIR_ALLOC(vendor) < 0) goto error; - vendor->name = virXPathString("string(@name)", ctxt); - if (!vendor->name) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing CPU vendor name")); + if (VIR_STRDUP(vendor->name, name) < 0) goto error; - } if (x86VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -746,40 +745,21 @@ x86VendorParse(xmlXPathContextPtr ctxt, if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0) goto error; + if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) + goto error; + + ret = 0; + cleanup: VIR_FREE(string); - return vendor; + return ret; error: x86VendorFree(vendor); - vendor = NULL; goto cleanup; } -static int -x86VendorsLoad(virCPUx86MapPtr map, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n) -{ - virCPUx86VendorPtr vendor; - size_t i; - - if (VIR_ALLOC_N(map->vendors, n) < 0) - return -1; - - for (i = 0; i < n; i++) { - ctxt->node = nodes[i]; - if (!(vendor = x86VendorParse(ctxt, map))) - return -1; - map->vendors[map->nvendors++] = vendor; - } - - return 0; -} - - static virCPUx86FeaturePtr x86FeatureNew(void) { @@ -901,27 +881,27 @@ x86ParseCPUID(xmlXPathContextPtr ctxt, } -static virCPUx86FeaturePtr +static int x86FeatureParse(xmlXPathContextPtr ctxt, - virCPUx86MapPtr map) + const char *name, + void *data) { + virCPUx86MapPtr map = data; xmlNodePtr *nodes = NULL; virCPUx86FeaturePtr feature; virCPUx86CPUID cpuid; size_t i; int n; char *str = NULL; + int ret = -1; if (!(feature = x86FeatureNew())) goto error; feature->migratable = true; - feature->name = virXPathString("string(@name)", ctxt); - if (!feature->name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing CPU feature name")); + + if (VIR_STRDUP(feature->name, name) < 0) goto error; - } if (x86FeatureFind(map, feature->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -949,46 +929,28 @@ x86FeatureParse(xmlXPathContextPtr ctxt, goto error; } + if (!feature->migratable && + VIR_APPEND_ELEMENT_COPY(map->migrate_blockers, + map->nblockers, + feature) < 0) + goto error; + + if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0) + goto error; + + ret = 0; + cleanup: VIR_FREE(nodes); VIR_FREE(str); - return feature; + return ret; error: x86FeatureFree(feature); - feature = NULL; goto cleanup; } -static int -x86FeaturesLoad(virCPUx86MapPtr map, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n) -{ - virCPUx86FeaturePtr feature; - size_t i; - - if (VIR_ALLOC_N(map->features, n) < 0) - return -1; - - for (i = 0; i < n; i++) { - ctxt->node = nodes[i]; - if (!(feature = x86FeatureParse(ctxt, map))) - return -1; - map->features[map->nfeatures++] = feature; - if (!feature->migratable && - VIR_APPEND_ELEMENT(map->migrate_blockers, - map->nblockers, - feature) < 0) - return -1; - } - - return 0; -} - - static virCPUx86ModelPtr x86ModelNew(void) { @@ -1184,47 +1146,46 @@ x86ModelCompare(virCPUx86ModelPtr model1, } -static virCPUx86ModelPtr +static int x86ModelParse(xmlXPathContextPtr ctxt, - virCPUx86MapPtr map) + const char *name, + void *data) { + virCPUx86MapPtr map = data; xmlNodePtr *nodes = NULL; virCPUx86ModelPtr model; char *vendor = NULL; size_t i; int n; + int ret = -1; if (!(model = x86ModelNew())) goto error; - model->name = virXPathString("string(@name)", ctxt); - if (!model->name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing CPU model name")); + if (VIR_STRDUP(model->name, name) < 0) goto error; - } if (virXPathNode("./model", ctxt)) { virCPUx86ModelPtr ancestor; - char *name; + char *anname; - name = virXPathString("string(./model/@name)", ctxt); - if (!name) { + anname = virXPathString("string(./model/@name)", ctxt); + if (!anname) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing ancestor's name in CPU model %s"), model->name); goto error; } - if (!(ancestor = x86ModelFind(map, name))) { + if (!(ancestor = x86ModelFind(map, anname))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Ancestor model %s not found for CPU model %s"), - name, model->name); - VIR_FREE(name); + anname, model->name); + VIR_FREE(anname); goto error; } - VIR_FREE(name); + VIR_FREE(anname); model->vendor = ancestor->vendor; model->signature = ancestor->signature; @@ -1279,62 +1240,43 @@ x86ModelParse(xmlXPathContextPtr ctxt, for (i = 0; i < n; i++) { virCPUx86FeaturePtr feature; - char *name; + char *ftname; - if (!(name = virXMLPropString(nodes[i], "name"))) { + if (!(ftname = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing feature name for CPU model %s"), model->name); goto error; } - if (!(feature = x86FeatureFind(map, name))) { + if (!(feature = x86FeatureFind(map, ftname))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Feature %s required by CPU model %s not found"), - name, model->name); - VIR_FREE(name); + ftname, model->name); + VIR_FREE(ftname); goto error; } - VIR_FREE(name); + VIR_FREE(ftname); if (x86DataAdd(&model->data, &feature->data)) goto error; } + if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) + goto error; + + ret = 0; + cleanup: VIR_FREE(vendor); VIR_FREE(nodes); - return model; + return ret; error: x86ModelFree(model); - model = NULL; goto cleanup; } -static int -x86ModelsLoad(virCPUx86MapPtr map, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n) -{ - virCPUx86ModelPtr model; - size_t i; - - if (VIR_ALLOC_N(map->models, n) < 0) - return -1; - - for (i = 0; i < n; i++) { - ctxt->node = nodes[i]; - if (!(model = x86ModelParse(ctxt, map))) - return -1; - map->models[map->nmodels++] = model; - } - - return 0; -} - - static void x86MapFree(virCPUx86MapPtr map) { @@ -1364,30 +1306,6 @@ x86MapFree(virCPUx86MapPtr map) } -static int -x86MapLoadCallback(cpuMapElement element, - xmlXPathContextPtr ctxt, - xmlNodePtr *nodes, - int n, - void *data) -{ - virCPUx86MapPtr map = data; - - switch (element) { - case CPU_MAP_ELEMENT_VENDOR: - return x86VendorsLoad(map, ctxt, nodes, n); - case CPU_MAP_ELEMENT_FEATURE: - return x86FeaturesLoad(map, ctxt, nodes, n); - case CPU_MAP_ELEMENT_MODEL: - return x86ModelsLoad(map, ctxt, nodes, n); - case CPU_MAP_ELEMENT_LAST: - break; - } - - return 0; -} - - static virCPUx86MapPtr virCPUx86LoadMap(void) { @@ -1396,7 +1314,7 @@ virCPUx86LoadMap(void) if (VIR_ALLOC(map) < 0) return NULL; - if (cpuMapLoad("x86", x86MapLoadCallback, map) < 0) + if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0) goto error; return map; -- 2.17.1

Get rid of the separate 'error:' label, so all code paths jump straight to the 'cleanup:' label. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu/cpu_ppc64.c | 38 ++++++++++++------------ src/cpu/cpu_x86.c | 71 ++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 60 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 75da5b77d8..fcba7e9b37 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -288,27 +288,28 @@ ppc64VendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, { struct ppc64_map *map = data; struct ppc64_vendor *vendor; + int ret = -1; if (VIR_ALLOC(vendor) < 0) return -1; if (VIR_STRDUP(vendor->name, name) < 0) - goto error; + goto cleanup; if (ppc64VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU vendor %s already defined"), vendor->name); - goto error; + goto cleanup; } if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) - goto error; + goto cleanup; - return 0; + ret = 0; - error: + cleanup: ppc64VendorFree(vendor); - return -1; + return ret; } @@ -327,15 +328,15 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, int ret = -1; if (VIR_ALLOC(model) < 0) - goto error; + goto cleanup; if (VIR_STRDUP(model->name, name) < 0) - goto error; + goto cleanup; if (ppc64ModelFind(map, model->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU model %s already defined"), model->name); - goto error; + goto cleanup; } if (virXPathBoolean("boolean(./vendor)", ctxt)) { @@ -344,14 +345,14 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid vendor element in CPU model %s"), model->name); - goto error; + goto cleanup; } if (!(model->vendor = ppc64VendorFind(map, vendor))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown vendor %s referenced by CPU model %s"), vendor, model->name); - goto error; + goto cleanup; } } @@ -359,11 +360,11 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing PVR information for CPU model %s"), model->name); - goto error; + goto cleanup; } if (VIR_ALLOC_N(model->data.pvr, n) < 0) - goto error; + goto cleanup; model->data.len = n; @@ -374,7 +375,7 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing or invalid PVR value in CPU model %s"), model->name); - goto error; + goto cleanup; } model->data.pvr[i].value = pvr; @@ -382,24 +383,21 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing or invalid PVR mask in CPU model %s"), model->name); - goto error; + goto cleanup; } model->data.pvr[i].mask = pvr; } if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) - goto error; + goto cleanup; ret = 0; cleanup: + ppc64ModelFree(model); VIR_FREE(vendor); VIR_FREE(nodes); return ret; - - error: - ppc64ModelFree(model); - goto cleanup; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 73af9d0885..8e4a3d0f77 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -723,15 +723,15 @@ x86VendorParse(xmlXPathContextPtr ctxt, int ret = -1; if (VIR_ALLOC(vendor) < 0) - goto error; + goto cleanup; if (VIR_STRDUP(vendor->name, name) < 0) - goto error; + goto cleanup; if (x86VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU vendor %s already defined"), vendor->name); - goto error; + goto cleanup; } string = virXPathString("string(@string)", ctxt); @@ -739,24 +739,21 @@ x86VendorParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing vendor string for CPU vendor %s"), vendor->name); - goto error; + goto cleanup; } if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0) - goto error; + goto cleanup; if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) - goto error; + goto cleanup; ret = 0; cleanup: + x86VendorFree(vendor); VIR_FREE(string); return ret; - - error: - x86VendorFree(vendor); - goto cleanup; } @@ -896,17 +893,17 @@ x86FeatureParse(xmlXPathContextPtr ctxt, int ret = -1; if (!(feature = x86FeatureNew())) - goto error; + goto cleanup; feature->migratable = true; if (VIR_STRDUP(feature->name, name) < 0) - goto error; + goto cleanup; if (x86FeatureFind(map, feature->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU feature %s already defined"), feature->name); - goto error; + goto cleanup; } str = virXPathString("string(@migratable)", ctxt); @@ -915,7 +912,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt, n = virXPathNodeSet("./cpuid", ctxt, &nodes); if (n < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { ctxt->node = nodes[i]; @@ -923,31 +920,28 @@ x86FeatureParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid cpuid[%zu] in %s feature"), i, feature->name); - goto error; + goto cleanup; } if (virCPUx86DataAddCPUIDInt(&feature->data, &cpuid)) - goto error; + goto cleanup; } if (!feature->migratable && VIR_APPEND_ELEMENT_COPY(map->migrate_blockers, map->nblockers, feature) < 0) - goto error; + goto cleanup; if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0) - goto error; + goto cleanup; ret = 0; cleanup: + x86FeatureFree(feature); VIR_FREE(nodes); VIR_FREE(str); return ret; - - error: - x86FeatureFree(feature); - goto cleanup; } @@ -1160,10 +1154,10 @@ x86ModelParse(xmlXPathContextPtr ctxt, int ret = -1; if (!(model = x86ModelNew())) - goto error; + goto cleanup; if (VIR_STRDUP(model->name, name) < 0) - goto error; + goto cleanup; if (virXPathNode("./model", ctxt)) { virCPUx86ModelPtr ancestor; @@ -1174,7 +1168,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing ancestor's name in CPU model %s"), model->name); - goto error; + goto cleanup; } if (!(ancestor = x86ModelFind(map, anname))) { @@ -1182,7 +1176,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, _("Ancestor model %s not found for CPU model %s"), anname, model->name); VIR_FREE(anname); - goto error; + goto cleanup; } VIR_FREE(anname); @@ -1190,7 +1184,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, model->vendor = ancestor->vendor; model->signature = ancestor->signature; if (x86DataCopy(&model->data, &ancestor->data) < 0) - goto error; + goto cleanup; } if (virXPathBoolean("boolean(./signature)", ctxt)) { @@ -1203,7 +1197,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid CPU signature family in model %s"), model->name); - goto error; + goto cleanup; } rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel); @@ -1211,7 +1205,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid CPU signature model in model %s"), model->name); - goto error; + goto cleanup; } model->signature = x86MakeSignature(sigFamily, sigModel, 0); @@ -1223,20 +1217,20 @@ x86ModelParse(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid vendor element in CPU model %s"), model->name); - goto error; + goto cleanup; } if (!(model->vendor = x86VendorFind(map, vendor))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown vendor %s referenced by CPU model %s"), vendor, model->name); - goto error; + goto cleanup; } } n = virXPathNodeSet("./feature", ctxt, &nodes); if (n < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { virCPUx86FeaturePtr feature; @@ -1245,7 +1239,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, if (!(ftname = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing feature name for CPU model %s"), model->name); - goto error; + goto cleanup; } if (!(feature = x86FeatureFind(map, ftname))) { @@ -1253,27 +1247,24 @@ x86ModelParse(xmlXPathContextPtr ctxt, _("Feature %s required by CPU model %s not found"), ftname, model->name); VIR_FREE(ftname); - goto error; + goto cleanup; } VIR_FREE(ftname); if (x86DataAdd(&model->data, &feature->data)) - goto error; + goto cleanup; } if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) - goto error; + goto cleanup; ret = 0; cleanup: + x86ModelFree(model); VIR_FREE(vendor); VIR_FREE(nodes); return ret; - - error: - x86ModelFree(model); - goto cleanup; } -- 2.17.1

In preparation for splitting up the CPU map data file, move it into a dedicated directory of its own. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 4 ++-- src/Makefile.am | 7 +------ src/cpu/cpu_map.c | 10 +++++----- src/cpu_map/Makefile.inc.am | 7 +++++++ src/{cpu/cpu_map.xml => cpu_map/index.xml} | 0 6 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 src/cpu_map/Makefile.inc.am rename src/{cpu/cpu_map.xml => cpu_map/index.xml} (100%) diff --git a/libvirt.spec.in b/libvirt.spec.in index 883c8a49e7..09f654b2ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1854,7 +1854,7 @@ exit 0 %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng -%{_datadir}/libvirt/cpu_map.xml +%{_datadir}/libvirt/cpu_map/*.xml %{_datadir}/libvirt/test-screenshot.png diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index cc1e619927..b28e40f7f7 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -260,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml -%{mingw32_datadir}/libvirt/cpu_map.xml +%{mingw32_datadir}/libvirt/cpu_map/*.xml %{mingw32_datadir}/libvirt/test-screenshot.png @@ -347,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml -%{mingw64_datadir}/libvirt/cpu_map.xml +%{mingw64_datadir}/libvirt/cpu_map/*.xml %{mingw64_datadir}/libvirt/test-screenshot.png diff --git a/src/Makefile.am b/src/Makefile.am index db8c8ebd1a..2a3ed0d42d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ man7_MANS = include util/Makefile.inc.am include conf/Makefile.inc.am include cpu/Makefile.inc.am +include cpu_map/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am @@ -364,12 +365,6 @@ check-local: check-protocol check-symfile check-symsorting \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) - - -pkgdata_DATA = cpu/cpu_map.xml - -EXTRA_DIST += $(pkgdata_DATA) - ######################### # # Build up list of libvirt.la source files based on configure conditions diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 400e6f1427..2079767df8 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -99,8 +99,8 @@ cpuMapLoadInclude(const char *filename, char *mapfile; if (!(mapfile = virFileFindResource(filename, - abs_topsrcdir "/src/cpu", - PKGDATADIR))) + abs_topsrcdir "/src/cpu_map", + PKGDATADIR "/cpu_map"))) return -1; VIR_DEBUG("Loading CPU map include from %s", mapfile); @@ -182,9 +182,9 @@ int cpuMapLoad(const char *arch, int ret = -1; char *mapfile; - if (!(mapfile = virFileFindResource("cpu_map.xml", - abs_topsrcdir "/src/cpu", - PKGDATADIR))) + if (!(mapfile = virFileFindResource("index.xml", + abs_topsrcdir "/src/cpu_map", + PKGDATADIR "/cpu_map"))) return -1; VIR_DEBUG("Loading '%s' CPU map from %s", NULLSTR(arch), mapfile); diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am new file mode 100644 index 0000000000..91728b9200 --- /dev/null +++ b/src/cpu_map/Makefile.inc.am @@ -0,0 +1,7 @@ + +cpumapdir = $(pkgdatadir)/cpu_map +cpumap_DATA = \ + cpu_map/index.xml \ + $(NULL) + +EXTRA_DIST += $(cpumap_DATA) diff --git a/src/cpu/cpu_map.xml b/src/cpu_map/index.xml similarity index 100% rename from src/cpu/cpu_map.xml rename to src/cpu_map/index.xml -- 2.17.1

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu_map/Makefile.inc.am | 7 +++++ src/cpu_map/index.xml | 41 +++++------------------------ src/cpu_map/ppc64_POWER6.xml | 6 +++++ src/cpu_map/ppc64_POWER7.xml | 7 +++++ src/cpu_map/ppc64_POWER8.xml | 8 ++++++ src/cpu_map/ppc64_POWER9.xml | 6 +++++ src/cpu_map/ppc64_POWERPC_e5500.xml | 6 +++++ src/cpu_map/ppc64_POWERPC_e6500.xml | 6 +++++ src/cpu_map/ppc64_vendors.xml | 4 +++ 9 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 src/cpu_map/ppc64_POWER6.xml create mode 100644 src/cpu_map/ppc64_POWER7.xml create mode 100644 src/cpu_map/ppc64_POWER8.xml create mode 100644 src/cpu_map/ppc64_POWER9.xml create mode 100644 src/cpu_map/ppc64_POWERPC_e5500.xml create mode 100644 src/cpu_map/ppc64_POWERPC_e6500.xml create mode 100644 src/cpu_map/ppc64_vendors.xml diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 91728b9200..64453cc384 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -2,6 +2,13 @@ cpumapdir = $(pkgdatadir)/cpu_map cpumap_DATA = \ cpu_map/index.xml \ + cpu_map/ppc64_vendors.xml \ + cpu_map/ppc64_POWER7.xml \ + cpu_map/ppc64_POWER9.xml \ + cpu_map/ppc64_POWERPC_e6500.xml \ + cpu_map/ppc64_POWER6.xml \ + cpu_map/ppc64_POWER8.xml \ + cpu_map/ppc64_POWERPC_e5500.xml \ $(NULL) EXTRA_DIST += $(cpumap_DATA) diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 9af190a579..ce4f0204b0 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -2340,43 +2340,16 @@ </arch> <arch name='ppc64'> - <!-- vendor definitions --> - <vendor name='IBM'/> - <vendor name='Freescale'/> + <include filename="ppc64_vendors.xml"/> <!-- IBM-based CPU models --> - <model name='POWER6'> - <vendor name='IBM'/> - <pvr value='0x003e0000' mask='0xffff0000'/> - </model> - - <model name='POWER7'> - <vendor name='IBM'/> - <pvr value='0x003f0000' mask='0xffff0000'/> - <pvr value='0x004a0000' mask='0xffff0000'/> - </model> - - <model name='POWER8'> - <vendor name='IBM'/> - <pvr value='0x004b0000' mask='0xffff0000'/> - <pvr value='0x004c0000' mask='0xffff0000'/> - <pvr value='0x004d0000' mask='0xffff0000'/> - </model> - - <model name='POWER9'> - <vendor name='IBM'/> - <pvr value='0x004e0000' mask='0xffff0000'/> - </model> + <include filename="ppc64_POWER6.xml"/> + <include filename="ppc64_POWER7.xml"/> + <include filename="ppc64_POWER8.xml"/> + <include filename="ppc64_POWER9.xml"/> <!-- Freescale-based CPU models --> - <model name='POWERPC_e5500'> - <vendor name='Freescale'/> - <pvr value='0x80240000' mask='0xffff0000'/> - </model> - - <model name='POWERPC_e6500'> - <vendor name='Freescale'/> - <pvr value='0x80400000' mask='0xffff0000'/> - </model> + <include filename="ppc64_POWERPC_e5500.xml"/> + <include filename="ppc64_POWERPC_e6500.xml"/> </arch> </cpus> diff --git a/src/cpu_map/ppc64_POWER6.xml b/src/cpu_map/ppc64_POWER6.xml new file mode 100644 index 0000000000..00e27495f4 --- /dev/null +++ b/src/cpu_map/ppc64_POWER6.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWER6'> + <vendor name='IBM'/> + <pvr value='0x003e0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_POWER7.xml b/src/cpu_map/ppc64_POWER7.xml new file mode 100644 index 0000000000..a071481805 --- /dev/null +++ b/src/cpu_map/ppc64_POWER7.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='POWER7'> + <vendor name='IBM'/> + <pvr value='0x003f0000' mask='0xffff0000'/> + <pvr value='0x004a0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_POWER8.xml b/src/cpu_map/ppc64_POWER8.xml new file mode 100644 index 0000000000..64d96fc4c4 --- /dev/null +++ b/src/cpu_map/ppc64_POWER8.xml @@ -0,0 +1,8 @@ +<cpus> + <model name='POWER8'> + <vendor name='IBM'/> + <pvr value='0x004b0000' mask='0xffff0000'/> + <pvr value='0x004c0000' mask='0xffff0000'/> + <pvr value='0x004d0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_POWER9.xml b/src/cpu_map/ppc64_POWER9.xml new file mode 100644 index 0000000000..149fcde924 --- /dev/null +++ b/src/cpu_map/ppc64_POWER9.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWER9'> + <vendor name='IBM'/> + <pvr value='0x004e0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_POWERPC_e5500.xml b/src/cpu_map/ppc64_POWERPC_e5500.xml new file mode 100644 index 0000000000..3d64c8926c --- /dev/null +++ b/src/cpu_map/ppc64_POWERPC_e5500.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWERPC_e5500'> + <vendor name='Freescale'/> + <pvr value='0x80240000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_POWERPC_e6500.xml b/src/cpu_map/ppc64_POWERPC_e6500.xml new file mode 100644 index 0000000000..b0d1006076 --- /dev/null +++ b/src/cpu_map/ppc64_POWERPC_e6500.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWERPC_e6500'> + <vendor name='Freescale'/> + <pvr value='0x80400000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu_map/ppc64_vendors.xml b/src/cpu_map/ppc64_vendors.xml new file mode 100644 index 0000000000..52ad45c0bd --- /dev/null +++ b/src/cpu_map/ppc64_vendors.xml @@ -0,0 +1,4 @@ +<cpus> + <vendor name='IBM'/> + <vendor name='Freescale'/> +</cpus> -- 2.17.1

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu_map/Makefile.inc.am | 47 + src/cpu_map/index.xml | 2374 +--------------------- src/cpu_map/x86_486.xml | 7 + src/cpu_map/x86_Broadwell-IBRS.xml | 61 + src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 59 + src/cpu_map/x86_Broadwell-noTSX.xml | 58 + src/cpu_map/x86_Broadwell.xml | 60 + src/cpu_map/x86_Conroe.xml | 33 + src/cpu_map/x86_EPYC-IBRS.xml | 73 + src/cpu_map/x86_EPYC.xml | 72 + src/cpu_map/x86_Haswell-IBRS.xml | 57 + src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 55 + src/cpu_map/x86_Haswell-noTSX.xml | 54 + src/cpu_map/x86_Haswell.xml | 56 + src/cpu_map/x86_IvyBridge-IBRS.xml | 51 + src/cpu_map/x86_IvyBridge.xml | 50 + src/cpu_map/x86_Nehalem-IBRS.xml | 38 + src/cpu_map/x86_Nehalem.xml | 37 + src/cpu_map/x86_Opteron_G1.xml | 31 + src/cpu_map/x86_Opteron_G2.xml | 35 + src/cpu_map/x86_Opteron_G3.xml | 40 + src/cpu_map/x86_Opteron_G4.xml | 50 + src/cpu_map/x86_Opteron_G5.xml | 53 + src/cpu_map/x86_Penryn.xml | 35 + src/cpu_map/x86_SandyBridge-IBRS.xml | 45 + src/cpu_map/x86_SandyBridge.xml | 44 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 70 + src/cpu_map/x86_Skylake-Client.xml | 69 + src/cpu_map/x86_Skylake-Server-IBRS.xml | 77 + src/cpu_map/x86_Skylake-Server.xml | 76 + src/cpu_map/x86_Westmere-IBRS.xml | 39 + src/cpu_map/x86_Westmere.xml | 38 + src/cpu_map/x86_athlon.xml | 28 + src/cpu_map/x86_core2duo.xml | 33 + src/cpu_map/x86_coreduo.xml | 29 + src/cpu_map/x86_cpu64-rhel5.xml | 29 + src/cpu_map/x86_cpu64-rhel6.xml | 31 + src/cpu_map/x86_features.xml | 440 ++++ src/cpu_map/x86_kvm32.xml | 26 + src/cpu_map/x86_kvm64.xml | 30 + src/cpu_map/x86_n270.xml | 30 + src/cpu_map/x86_pentium.xml | 13 + src/cpu_map/x86_pentium2.xml | 22 + src/cpu_map/x86_pentium3.xml | 23 + src/cpu_map/x86_pentiumpro.xml | 21 + src/cpu_map/x86_phenom.xml | 36 + src/cpu_map/x86_qemu32.xml | 22 + src/cpu_map/x86_qemu64.xml | 40 + src/cpu_map/x86_vendors.xml | 4 + 49 files changed, 2474 insertions(+), 2327 deletions(-) create mode 100644 src/cpu_map/x86_486.xml create mode 100644 src/cpu_map/x86_Broadwell-IBRS.xml create mode 100644 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml create mode 100644 src/cpu_map/x86_Broadwell-noTSX.xml create mode 100644 src/cpu_map/x86_Broadwell.xml create mode 100644 src/cpu_map/x86_Conroe.xml create mode 100644 src/cpu_map/x86_EPYC-IBRS.xml create mode 100644 src/cpu_map/x86_EPYC.xml create mode 100644 src/cpu_map/x86_Haswell-IBRS.xml create mode 100644 src/cpu_map/x86_Haswell-noTSX-IBRS.xml create mode 100644 src/cpu_map/x86_Haswell-noTSX.xml create mode 100644 src/cpu_map/x86_Haswell.xml create mode 100644 src/cpu_map/x86_IvyBridge-IBRS.xml create mode 100644 src/cpu_map/x86_IvyBridge.xml create mode 100644 src/cpu_map/x86_Nehalem-IBRS.xml create mode 100644 src/cpu_map/x86_Nehalem.xml create mode 100644 src/cpu_map/x86_Opteron_G1.xml create mode 100644 src/cpu_map/x86_Opteron_G2.xml create mode 100644 src/cpu_map/x86_Opteron_G3.xml create mode 100644 src/cpu_map/x86_Opteron_G4.xml create mode 100644 src/cpu_map/x86_Opteron_G5.xml create mode 100644 src/cpu_map/x86_Penryn.xml create mode 100644 src/cpu_map/x86_SandyBridge-IBRS.xml create mode 100644 src/cpu_map/x86_SandyBridge.xml create mode 100644 src/cpu_map/x86_Skylake-Client-IBRS.xml create mode 100644 src/cpu_map/x86_Skylake-Client.xml create mode 100644 src/cpu_map/x86_Skylake-Server-IBRS.xml create mode 100644 src/cpu_map/x86_Skylake-Server.xml create mode 100644 src/cpu_map/x86_Westmere-IBRS.xml create mode 100644 src/cpu_map/x86_Westmere.xml create mode 100644 src/cpu_map/x86_athlon.xml create mode 100644 src/cpu_map/x86_core2duo.xml create mode 100644 src/cpu_map/x86_coreduo.xml create mode 100644 src/cpu_map/x86_cpu64-rhel5.xml create mode 100644 src/cpu_map/x86_cpu64-rhel6.xml create mode 100644 src/cpu_map/x86_features.xml create mode 100644 src/cpu_map/x86_kvm32.xml create mode 100644 src/cpu_map/x86_kvm64.xml create mode 100644 src/cpu_map/x86_n270.xml create mode 100644 src/cpu_map/x86_pentium.xml create mode 100644 src/cpu_map/x86_pentium2.xml create mode 100644 src/cpu_map/x86_pentium3.xml create mode 100644 src/cpu_map/x86_pentiumpro.xml create mode 100644 src/cpu_map/x86_phenom.xml create mode 100644 src/cpu_map/x86_qemu32.xml create mode 100644 src/cpu_map/x86_qemu64.xml create mode 100644 src/cpu_map/x86_vendors.xml diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 64453cc384..4b93841bd6 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -9,6 +9,53 @@ cpumap_DATA = \ cpu_map/ppc64_POWER6.xml \ cpu_map/ppc64_POWER8.xml \ cpu_map/ppc64_POWERPC_e5500.xml \ + cpu_map/x86_features.xml \ + cpu_map/x86_vendors.xml \ + cpu_map/x86_486.xml \ + cpu_map/x86_athlon.xml \ + cpu_map/x86_Broadwell.xml \ + cpu_map/x86_Broadwell-IBRS.xml \ + cpu_map/x86_Broadwell-noTSX.xml \ + cpu_map/x86_Broadwell-noTSX-IBRS.xml \ + cpu_map/x86_Conroe.xml \ + cpu_map/x86_core2duo.xml \ + cpu_map/x86_coreduo.xml \ + cpu_map/x86_cpu64-rhel5.xml \ + cpu_map/x86_cpu64-rhel6.xml \ + cpu_map/x86_EPYC.xml \ + cpu_map/x86_EPYC-IBRS.xml \ + cpu_map/x86_Haswell.xml \ + cpu_map/x86_Haswell-IBRS.xml \ + cpu_map/x86_Haswell-noTSX.xml \ + cpu_map/x86_Haswell-noTSX-IBRS.xml \ + cpu_map/x86_IvyBridge.xml \ + cpu_map/x86_IvyBridge-IBRS.xml \ + cpu_map/x86_kvm32.xml \ + cpu_map/x86_kvm64.xml \ + cpu_map/x86_n270.xml \ + cpu_map/x86_Nehalem.xml \ + cpu_map/x86_Nehalem-IBRS.xml \ + cpu_map/x86_Opteron_G1.xml \ + cpu_map/x86_Opteron_G2.xml \ + cpu_map/x86_Opteron_G3.xml \ + cpu_map/x86_Opteron_G4.xml \ + cpu_map/x86_Opteron_G5.xml \ + cpu_map/x86_Penryn.xml \ + cpu_map/x86_pentium.xml \ + cpu_map/x86_pentium2.xml \ + cpu_map/x86_pentium3.xml \ + cpu_map/x86_pentiumpro.xml \ + cpu_map/x86_phenom.xml \ + cpu_map/x86_qemu32.xml \ + cpu_map/x86_qemu64.xml \ + cpu_map/x86_SandyBridge.xml \ + cpu_map/x86_SandyBridge-IBRS.xml \ + cpu_map/x86_Skylake-Client.xml \ + cpu_map/x86_Skylake-Client-IBRS.xml \ + cpu_map/x86_Skylake-Server.xml \ + cpu_map/x86_Skylake-Server-IBRS.xml \ + cpu_map/x86_Westmere.xml \ + cpu_map/x86_Westmere-IBRS.xml \ $(NULL) EXTRA_DIST += $(cpumap_DATA) diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index ce4f0204b0..db82980dd4 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -1,2342 +1,62 @@ <cpus> <arch name='x86'> - <!-- vendor definitions --> - <vendor name='Intel' string='GenuineIntel'/> - <vendor name='AMD' string='AuthenticAMD'/> - - <!-- standard features, EDX --> - <feature name='fpu'> - <cpuid eax_in='0x01' edx='0x00000001'/> - </feature> - <feature name='vme'> - <cpuid eax_in='0x01' edx='0x00000002'/> - </feature> - <feature name='de'> - <cpuid eax_in='0x01' edx='0x00000004'/> - </feature> - <feature name='pse'> - <cpuid eax_in='0x01' edx='0x00000008'/> - </feature> - <feature name='tsc'> - <cpuid eax_in='0x01' edx='0x00000010'/> - </feature> - <feature name='msr'> - <cpuid eax_in='0x01' edx='0x00000020'/> - </feature> - <feature name='pae'> - <cpuid eax_in='0x01' edx='0x00000040'/> - </feature> - <feature name='mce'> - <cpuid eax_in='0x01' edx='0x00000080'/> - </feature> - <feature name='cx8'> - <cpuid eax_in='0x01' edx='0x00000100'/> - </feature> - <feature name='apic'> - <cpuid eax_in='0x01' edx='0x00000200'/> - </feature> - <feature name='sep'> - <cpuid eax_in='0x01' edx='0x00000800'/> - </feature> - <feature name='mtrr'> - <cpuid eax_in='0x01' edx='0x00001000'/> - </feature> - <feature name='pge'> - <cpuid eax_in='0x01' edx='0x00002000'/> - </feature> - <feature name='mca'> - <cpuid eax_in='0x01' edx='0x00004000'/> - </feature> - <feature name='cmov'> - <cpuid eax_in='0x01' edx='0x00008000'/> - </feature> - <feature name='pat'> - <cpuid eax_in='0x01' edx='0x00010000'/> - </feature> - <feature name='pse36'> - <cpuid eax_in='0x01' edx='0x00020000'/> - </feature> - <feature name='pn'> - <cpuid eax_in='0x01' edx='0x00040000'/> - </feature> - <feature name='clflush'> - <cpuid eax_in='0x01' edx='0x00080000'/> - </feature> - <feature name='ds'> - <cpuid eax_in='0x01' edx='0x00200000'/> - </feature> - <feature name='acpi'> - <cpuid eax_in='0x01' edx='0x00400000'/> - </feature> - <feature name='mmx'> - <cpuid eax_in='0x01' edx='0x00800000'/> - </feature> - <feature name='fxsr'> - <cpuid eax_in='0x01' edx='0x01000000'/> - </feature> - <feature name='sse'> - <cpuid eax_in='0x01' edx='0x02000000'/> - </feature> - <feature name='sse2'> - <cpuid eax_in='0x01' edx='0x04000000'/> - </feature> - <feature name='ss'> - <cpuid eax_in='0x01' edx='0x08000000'/> - </feature> - <feature name='ht'> - <cpuid eax_in='0x01' edx='0x10000000'/> - </feature> - <feature name='tm'> - <cpuid eax_in='0x01' edx='0x20000000'/> - </feature> - <feature name='ia64'> - <cpuid eax_in='0x01' edx='0x40000000'/> - </feature> - <feature name='pbe'> - <cpuid eax_in='0x01' edx='0x80000000'/> - </feature> - - <!-- standard features, ECX --> - <feature name='pni'> <!-- sse3 --> - <cpuid eax_in='0x01' ecx='0x00000001'/> - </feature> - <feature name='pclmuldq'> <!-- pclmulqdq --> - <cpuid eax_in='0x01' ecx='0x00000002'/> - </feature> - <feature name='dtes64'> - <cpuid eax_in='0x01' ecx='0x00000004'/> - </feature> - <feature name='monitor'> - <cpuid eax_in='0x01' ecx='0x00000008'/> - </feature> - <feature name='ds_cpl'> <!-- ds-cpl --> - <cpuid eax_in='0x01' ecx='0x00000010'/> - </feature> - <feature name='vmx'> - <cpuid eax_in='0x01' ecx='0x00000020'/> - </feature> - <feature name='smx'> - <cpuid eax_in='0x01' ecx='0x00000040'/> - </feature> - <feature name='est'> - <cpuid eax_in='0x01' ecx='0x00000080'/> - </feature> - <feature name='tm2'> - <cpuid eax_in='0x01' ecx='0x00000100'/> - </feature> - <feature name='ssse3'> - <cpuid eax_in='0x01' ecx='0x00000200'/> - </feature> - <feature name='cid'> - <cpuid eax_in='0x01' ecx='0x00000400'/> - </feature> - <feature name='fma'> - <cpuid eax_in='0x01' ecx='0x00001000'/> - </feature> - <feature name='cx16'> - <cpuid eax_in='0x01' ecx='0x00002000'/> - </feature> - <feature name='xtpr'> - <cpuid eax_in='0x01' ecx='0x00004000'/> - </feature> - <feature name='pdcm'> - <cpuid eax_in='0x01' ecx='0x00008000'/> - </feature> - <feature name='pcid'> - <cpuid eax_in='0x01' ecx='0x00020000'/> - </feature> - <feature name='dca'> - <cpuid eax_in='0x01' ecx='0x00040000'/> - </feature> - <feature name='sse4.1'> <!-- sse4-1, sse4_1 --> - <cpuid eax_in='0x01' ecx='0x00080000'/> - </feature> - <feature name='sse4.2'> <!-- sse4-2, sse4_2 --> - <cpuid eax_in='0x01' ecx='0x00100000'/> - </feature> - <feature name='x2apic'> - <cpuid eax_in='0x01' ecx='0x00200000'/> - </feature> - <feature name='movbe'> - <cpuid eax_in='0x01' ecx='0x00400000'/> - </feature> - <feature name='popcnt'> - <cpuid eax_in='0x01' ecx='0x00800000'/> - </feature> - <feature name='tsc-deadline'> - <cpuid eax_in='0x01' ecx='0x01000000'/> - </feature> - <feature name='aes'> - <cpuid eax_in='0x01' ecx='0x02000000'/> - </feature> - <feature name='xsave'> - <cpuid eax_in='0x01' ecx='0x04000000'/> - </feature> - <feature name='osxsave'> - <cpuid eax_in='0x01' ecx='0x08000000'/> - </feature> - <feature name='avx'> - <cpuid eax_in='0x01' ecx='0x10000000'/> - </feature> - <feature name='f16c'> - <cpuid eax_in='0x01' ecx='0x20000000'/> - </feature> - <feature name='rdrand'> - <cpuid eax_in='0x01' ecx='0x40000000'/> - </feature> - <feature name='hypervisor'> - <cpuid eax_in='0x01' ecx='0x80000000'/> - </feature> - - <!-- Termal Power and Management --> - <feature name='arat'> - <cpuid eax_in='0x06' eax='0x00000004'/> - </feature> - - <!-- cpuid function 0x7 ecx 0x0 features --> - <feature name='fsgsbase'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000001'/> - </feature> - <feature name='tsc_adjust'> <!-- tsc-adjust --> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000002'/> - </feature> - <feature name='bmi1'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000008'/> - </feature> - <feature name='hle'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000010'/> - </feature> - <feature name='avx2'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000020'/> - </feature> - <feature name='smep'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000080'/> - </feature> - <feature name='bmi2'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000100'/> - </feature> - <feature name='erms'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000200'/> - </feature> - <feature name='invpcid'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000400'/> - </feature> - <feature name='rtm'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000800'/> - </feature> - <feature name='cmt'> <!-- cqm --> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00001000'/> - </feature> - <feature name='mpx'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00004000'/> - </feature> - <feature name='avx512f'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00010000'/> - </feature> - <feature name='avx512dq'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00020000'/> - </feature> - <feature name='rdseed'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00040000'/> - </feature> - <feature name='adx'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00080000'/> - </feature> - <feature name='smap'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00100000'/> - </feature> - <feature name='avx512ifma'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00200000'/> - </feature> - <feature name='pcommit'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00400000'/> - </feature> - <feature name='clflushopt'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00800000'/> - </feature> - <feature name='clwb'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/> - </feature> - <feature name='avx512pf'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/> - </feature> - <feature name='avx512er'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x08000000'/> - </feature> - <feature name='avx512cd'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x10000000'/> - </feature> - <feature name='sha-ni'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x20000000'/> - </feature> - <feature name='avx512bw'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x40000000'/> - </feature> - <feature name='avx512vl'> - <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x80000000'/> - </feature> - - <feature name='avx512vbmi'> - <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/> - </feature> - <feature name='pku'> - <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/> - </feature> - <feature name='ospke'> - <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/> - </feature> - <feature name='la57'> - <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/> - </feature> - - <feature name='avx512-4vnniw'> - <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/> - </feature> - <feature name='avx512-4fmaps'> - <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/> - </feature> - <feature name='spec-ctrl'> - <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/> - </feature> - <feature name='ssbd'> - <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/> - </feature> - - <!-- Processor Extended State Enumeration sub leaf 1 --> - <feature name='xsaveopt'> - <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/> - </feature> - <feature name='xsavec'> - <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000002'/> - </feature> - <feature name='xgetbv1'> - <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000004'/> - </feature> - <feature name='xsaves' migratable='no'> - <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/> - </feature> - - <!-- cpuid level 0x0000000f:1 (edx) --> - <feature name='mbm_total'> - <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/> - </feature> - <feature name='mbm_local'> - <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/> - </feature> - - <!-- extended features, EDX --> - <feature name='syscall'> - <cpuid eax_in='0x80000001' edx='0x00000800'/> - </feature> - <feature name='nx'> <!-- xd --> - <cpuid eax_in='0x80000001' edx='0x00100000'/> - </feature> - <feature name='mmxext'> - <cpuid eax_in='0x80000001' edx='0x00400000'/> - </feature> - <feature name='fxsr_opt'> <!-- ffxsr, fxsr-opt --> - <cpuid eax_in='0x80000001' edx='0x02000000'/> - </feature> - <feature name='pdpe1gb'> - <cpuid eax_in='0x80000001' edx='0x04000000'/> - </feature> - <feature name='rdtscp'> - <cpuid eax_in='0x80000001' edx='0x08000000'/> - </feature> - <feature name='lm'> <!-- i64 --> - <cpuid eax_in='0x80000001' edx='0x20000000'/> - </feature> - <feature name='3dnowext'> - <cpuid eax_in='0x80000001' edx='0x40000000'/> - </feature> - <feature name='3dnow'> - <cpuid eax_in='0x80000001' edx='0x80000000'/> - </feature> - - <!-- extended features, ECX --> - <feature name='lahf_lm'> <!-- lahf-lm --> - <cpuid eax_in='0x80000001' ecx='0x00000001'/> - </feature> - <feature name='cmp_legacy'> <!-- cmp-legacy --> - <cpuid eax_in='0x80000001' ecx='0x00000002'/> - </feature> - <feature name='svm'> - <cpuid eax_in='0x80000001' ecx='0x00000004'/> - </feature> - <feature name='extapic'> - <cpuid eax_in='0x80000001' ecx='0x00000008'/> - </feature> - <feature name='cr8legacy'> - <cpuid eax_in='0x80000001' ecx='0x00000010'/> - </feature> - <feature name='abm'> - <cpuid eax_in='0x80000001' ecx='0x00000020'/> - </feature> - <feature name='sse4a'> - <cpuid eax_in='0x80000001' ecx='0x00000040'/> - </feature> - <feature name='misalignsse'> - <cpuid eax_in='0x80000001' ecx='0x00000080'/> - </feature> - <feature name='3dnowprefetch'> - <cpuid eax_in='0x80000001' ecx='0x00000100'/> - </feature> - <feature name='osvw'> - <cpuid eax_in='0x80000001' ecx='0x00000200'/> - </feature> - <feature name='ibs'> - <cpuid eax_in='0x80000001' ecx='0x00000400'/> - </feature> - <feature name='xop'> - <cpuid eax_in='0x80000001' ecx='0x00000800'/> - </feature> - <feature name='skinit'> - <cpuid eax_in='0x80000001' ecx='0x00001000'/> - </feature> - <feature name='wdt'> - <cpuid eax_in='0x80000001' ecx='0x00002000'/> - </feature> - <feature name='lwp'> - <cpuid eax_in='0x80000001' ecx='0x00008000'/> - </feature> - <feature name='fma4'> - <cpuid eax_in='0x80000001' ecx='0x00010000'/> - </feature> - <feature name='tce'> - <cpuid eax_in='0x80000001' ecx='0x00020000'/> - </feature> - <feature name='cvt16'> - <cpuid eax_in='0x80000001' ecx='0x00040000'/> - </feature> - <feature name='nodeid_msr'> <!-- nodeid-msr --> - <cpuid eax_in='0x80000001' ecx='0x00080000'/> - </feature> - <feature name='tbm'> - <cpuid eax_in='0x80000001' ecx='0x00200000'/> - </feature> - <feature name='topoext'> - <cpuid eax_in='0x80000001' ecx='0x00400000'/> - </feature> - <feature name='perfctr_core'> <!-- perfctr-core --> - <cpuid eax_in='0x80000001' ecx='0x00800000'/> - </feature> - <feature name='perfctr_nb'> <!-- perfctr-nb --> - <cpuid eax_in='0x80000001' ecx='0x01000000'/> - </feature> - - <!-- Advanced Power Management edx features --> - <feature name='invtsc' migratable='no'> - <cpuid eax_in='0x80000007' edx='0x00000100'/> - </feature> - - <!-- More AMD-specific features --> - <feature name='ibpb'> - <cpuid eax_in='0x80000008' ebx='0x00001000'/> - </feature> - <feature name='amd-ssbd'> - <cpuid eax_in='0x80000008' ebx='0x01000000'/> - </feature> - <feature name='virt-ssbd'> - <cpuid eax_in='0x80000008' ebx='0x02000000'/> - </feature> - <feature name='amd-no-ssb'> - <cpuid eax_in='0x80000008' ebx='0x04000000'/> - </feature> + <include filename="x86_vendors.xml"/> + <include filename="x86_features.xml"/> <!-- models --> - <model name='486'> - <feature name='fpu'/> - <feature name='pse'/> - <feature name='vme'/> - </model> + <include filename="x86_486.xml"/> <!-- Intel-based QEMU generic CPU models --> - <model name='pentium'> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='pse'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='pentium2'> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='pentium3'> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='pentiumpro'> - <feature name='apic'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='tsc'/> - </model> - - <model name='coreduo'> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='monitor'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='n270'> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='monitor'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='ssse3'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='core2duo'> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='monitor'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> + <include filename="x86_pentium.xml"/> + <include filename="x86_pentium2.xml"/> + <include filename="x86_pentium3.xml"/> + <include filename="x86_pentiumpro.xml"/> + <include filename="x86_coreduo.xml"/> + <include filename="x86_n270.xml"/> + <include filename="x86_core2duo.xml"/> <!-- Generic QEMU CPU models --> - <model name='qemu32'> - <feature name='apic'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='tsc'/> - </model> - - <model name='kvm32'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='tsc'/> - </model> - - <model name='cpu64-rhel5'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='cpu64-rhel6'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='kvm64'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='qemu64'> - <!-- These are supported only by TCG. KVM supports them only if the - host does. So we leave them out: - - <feature name='abm'/> - <feature name='lahf_lm'/> - <feature name='popcnt'/> - <feature name='sse4a'/> - --> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='svm'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> + <include filename="x86_qemu32.xml"/> + <include filename="x86_kvm32.xml"/> + <include filename="x86_cpu64-rhel5.xml"/> + <include filename="x86_cpu64-rhel6.xml"/> + <include filename="x86_qemu64.xml"/> + <include filename="x86_kvm64.xml"/> <!-- Intel CPU models --> - <model name='Conroe'> - <signature family='6' model='15'/> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Penryn'> - <signature family='6' model='23'/> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='sse4.1'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Nehalem'> - <signature family='6' model='26'/> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='sse4.1'/> - <feature name='sse4.2'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Nehalem-IBRS'> - <signature family='6' model='26'/> - <vendor name='Intel'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <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'/> - </model> - - <model name='Westmere'> - <signature family='6' model='44'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='sse4.1'/> - <feature name='sse4.2'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Westmere-IBRS'> - <signature family='6' model='44'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <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'/> - </model> - - <model name='SandyBridge'> - <signature family='6' model='42'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pclmuldq'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='SandyBridge-IBRS'> - <signature family='6' model='42'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pclmuldq'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='IvyBridge'> - <signature family='6' model='58'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='f16c'/> - <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='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pclmuldq'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdrand'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='IvyBridge-IBRS'> - <signature family='6' model='58'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='f16c'/> - <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='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pclmuldq'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdrand'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Haswell-noTSX'> - <signature family='6' model='60'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Haswell-noTSX-IBRS'> - <signature family='6' model='60'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Haswell'> - <signature family='6' model='60'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='fma'/> - <feature name='fpu'/> - <feature name='fsgsbase'/> - <feature name='fxsr'/> - <feature name='hle'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='rtm'/> - <feature name='sep'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Haswell-IBRS'> - <signature family='6' model='60'/> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='fma'/> - <feature name='fpu'/> - <feature name='fsgsbase'/> - <feature name='fxsr'/> - <feature name='hle'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='rtm'/> - <feature name='sep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Broadwell-noTSX'> - <signature family='6' model='61'/> - <vendor name='Intel'/> - <feature name='3dnowprefetch'/> - <feature name='adx'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdseed'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='smap'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Broadwell-noTSX-IBRS'> - <signature family='6' model='61'/> - <vendor name='Intel'/> - <feature name='3dnowprefetch'/> - <feature name='adx'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Broadwell'> - <signature family='6' model='61'/> - <vendor name='Intel'/> - <feature name='3dnowprefetch'/> - <feature name='adx'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='fma'/> - <feature name='fpu'/> - <feature name='fsgsbase'/> - <feature name='fxsr'/> - <feature name='hle'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdseed'/> - <feature name='rdtscp'/> - <feature name='rtm'/> - <feature name='sep'/> - <feature name='smap'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Broadwell-IBRS'> - <signature family='6' model='61'/> - <vendor name='Intel'/> - <feature name='3dnowprefetch'/> - <feature name='adx'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='avx2'/> - <feature name='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='erms'/> - <feature name='fma'/> - <feature name='fpu'/> - <feature name='fsgsbase'/> - <feature name='fxsr'/> - <feature name='hle'/> - <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='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdseed'/> - <feature name='rdtscp'/> - <feature name='rtm'/> - <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='x2apic'/> - <feature name='xsave'/> - </model> - - <model name='Skylake-Client'> - <signature family='6' model='94'/> - <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='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <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='hle'/> - <feature name='invpcid'/> - <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='pcid'/> - <feature name='pclmuldq'/> - <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='rtm'/> - <feature name='sep'/> - <feature name='smap'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xgetbv1'/> - <feature name='xsave'/> - <feature name='xsavec'/> - <feature name='xsaveopt'/> - </model> - - <model name='Skylake-Client-IBRS'> - <signature family='6' model='94'/> - <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='bmi1'/> - <feature name='bmi2'/> - <feature name='clflush'/> - <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='hle'/> - <feature name='invpcid'/> - <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='pcid'/> - <feature name='pclmuldq'/> - <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='rtm'/> - <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='x2apic'/> - <feature name='xgetbv1'/> - <feature name='xsave'/> - <feature name='xsavec'/> - <feature name='xsaveopt'/> - </model> - - <model name='Skylake-Server'> - <signature family='6' model='85'/> - <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='hle'/> - <feature name='invpcid'/> - <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='pcid'/> - <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='rtm'/> - <feature name='sep'/> - <feature name='smap'/> - <feature name='smep'/> - <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='x2apic'/> - <feature name='xgetbv1'/> - <feature name='xsave'/> - <feature name='xsavec'/> - <feature name='xsaveopt'/> - </model> - - <model name='Skylake-Server-IBRS'> - <signature family='6' model='85'/> - <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='hle'/> - <feature name='invpcid'/> - <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='pcid'/> - <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='rtm'/> - <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='x2apic'/> - <feature name='xgetbv1'/> - <feature name='xsave'/> - <feature name='xsavec'/> - <feature name='xsaveopt'/> - </model> + <include filename="x86_Conroe.xml"/> + <include filename="x86_Penryn.xml"/> + <include filename="x86_Nehalem.xml"/> + <include filename="x86_Nehalem-IBRS.xml"/> + <include filename="x86_Westmere.xml"/> + <include filename="x86_Westmere-IBRS.xml"/> + <include filename="x86_SandyBridge.xml"/> + <include filename="x86_SandyBridge-IBRS.xml"/> + <include filename="x86_IvyBridge.xml"/> + <include filename="x86_IvyBridge-IBRS.xml"/> + <include filename="x86_Haswell-noTSX.xml"/> + <include filename="x86_Haswell-noTSX-IBRS.xml"/> + <include filename="x86_Haswell.xml"/> + <include filename="x86_Haswell-IBRS.xml"/> + <include filename="x86_Broadwell-noTSX.xml"/> + <include filename="x86_Broadwell-noTSX-IBRS.xml"/> + <include filename="x86_Broadwell.xml"/> + <include filename="x86_Broadwell-IBRS.xml"/> + <include filename="x86_Skylake-Client.xml"/> + <include filename="x86_Skylake-Client-IBRS.xml"/> + <include filename="x86_Skylake-Server.xml"/> + <include filename="x86_Skylake-Server-IBRS.xml"/> <!-- AMD CPUs --> - <model name='athlon'> - <vendor name='AMD'/> - <feature name='3dnow'/> - <feature name='3dnowext'/> - <feature name='apic'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='mmxext'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='tsc'/> - <feature name='vme'/> - </model> - - <model name='phenom'> - <vendor name='AMD'/> - <feature name='3dnow'/> - <feature name='3dnowext'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='fxsr_opt'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='mmxext'/> - <feature name='monitor'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='svm'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Opteron_G1'> - <signature family='15' model='6'/> - <vendor name='AMD'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Opteron_G2'> - <signature family='15' model='6'/> - <vendor name='AMD'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='svm'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Opteron_G3'> - <signature family='15' model='6'/> - <vendor name='AMD'/> - <feature name='abm'/> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='misalignsse'/> - <feature name='mmx'/> - <feature name='monitor'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='sse4a'/> - <feature name='svm'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='Opteron_G4'> - <signature family='21' model='1'/> - <vendor name='AMD'/> - <feature name='3dnowprefetch'/> - <feature name='abm'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fma4'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='misalignsse'/> - <feature name='mmx'/> - <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='rdtscp'/> - <feature name='sep'/> - <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='xop'/> - <feature name='xsave'/> - </model> - - <model name='Opteron_G5'> - <signature family='21' model='2'/> - <vendor name='AMD'/> - <feature name='3dnowprefetch'/> - <feature name='abm'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='f16c'/> - <feature name='fma'/> - <feature name='fma4'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='misalignsse'/> - <feature name='mmx'/> - <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='rdtscp'/> - <feature name='sep'/> - <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='tbm'/> - <feature name='tsc'/> - <feature name='xop'/> - <feature name='xsave'/> - </model> - - <model name='EPYC'> - <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='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='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='misalignsse'/> - <feature name='mmx'/> - <feature name='mmxext'/> - <feature name='monitor'/> - <feature name='movbe'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='osvw'/> - <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='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='xsaveopt'/> - </model> - - <model name='EPYC-IBPB'> - <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='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='monitor'/> - <feature name='movbe'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='osvw'/> - <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='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='xsaveopt'/> - </model> + <include filename="x86_athlon.xml"/> + <include filename="x86_phenom.xml"/> + <include filename="x86_Opteron_G1.xml"/> + <include filename="x86_Opteron_G2.xml"/> + <include filename="x86_Opteron_G3.xml"/> + <include filename="x86_Opteron_G4.xml"/> + <include filename="x86_Opteron_G5.xml"/> + <include filename="x86_EPYC.xml"/> + <include filename="x86_EPYC-IBRS.xml"/> </arch> <arch name='ppc64'> diff --git a/src/cpu_map/x86_486.xml b/src/cpu_map/x86_486.xml new file mode 100644 index 0000000000..61fa3797e8 --- /dev/null +++ b/src/cpu_map/x86_486.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='486'> + <feature name='fpu'/> + <feature name='pse'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml new file mode 100644 index 0000000000..fc7a3371a5 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-IBRS.xml @@ -0,0 +1,61 @@ +<cpus> + <model name='Broadwell-IBRS'> + <signature family='6' model='61'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml new file mode 100644 index 0000000000..19949cb6ca --- /dev/null +++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml @@ -0,0 +1,59 @@ +<cpus> + <model name='Broadwell-noTSX-IBRS'> + <signature family='6' model='61'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml new file mode 100644 index 0000000000..6219bd4102 --- /dev/null +++ b/src/cpu_map/x86_Broadwell-noTSX.xml @@ -0,0 +1,58 @@ +<cpus> + <model name='Broadwell-noTSX'> + <signature family='6' model='61'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml new file mode 100644 index 0000000000..1511394f0b --- /dev/null +++ b/src/cpu_map/x86_Broadwell.xml @@ -0,0 +1,60 @@ +<cpus> + <model name='Broadwell'> + <signature family='6' model='61'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Conroe.xml b/src/cpu_map/x86_Conroe.xml new file mode 100644 index 0000000000..ebcab7be31 --- /dev/null +++ b/src/cpu_map/x86_Conroe.xml @@ -0,0 +1,33 @@ +<cpus> + <model name='Conroe'> + <signature family='6' model='15'/> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC-IBRS.xml b/src/cpu_map/x86_EPYC-IBRS.xml new file mode 100644 index 0000000000..219ead70df --- /dev/null +++ b/src/cpu_map/x86_EPYC-IBRS.xml @@ -0,0 +1,73 @@ +<cpus> + <model name='EPYC-IBPB'> + <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='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='monitor'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='osvw'/> + <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='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='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml new file mode 100644 index 0000000000..6458dc820c --- /dev/null +++ b/src/cpu_map/x86_EPYC.xml @@ -0,0 +1,72 @@ +<cpus> + <model name='EPYC'> + <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='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='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='monitor'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='osvw'/> + <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='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='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml new file mode 100644 index 0000000000..01bab7b803 --- /dev/null +++ b/src/cpu_map/x86_Haswell-IBRS.xml @@ -0,0 +1,57 @@ +<cpus> + <model name='Haswell-IBRS'> + <signature family='6' model='60'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml new file mode 100644 index 0000000000..7b53b7be29 --- /dev/null +++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml @@ -0,0 +1,55 @@ +<cpus> + <model name='Haswell-noTSX-IBRS'> + <signature family='6' model='60'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml new file mode 100644 index 0000000000..10b460818a --- /dev/null +++ b/src/cpu_map/x86_Haswell-noTSX.xml @@ -0,0 +1,54 @@ +<cpus> + <model name='Haswell-noTSX'> + <signature family='6' model='60'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml new file mode 100644 index 0000000000..84275b1bdf --- /dev/null +++ b/src/cpu_map/x86_Haswell.xml @@ -0,0 +1,56 @@ +<cpus> + <model name='Haswell'> + <signature family='6' model='60'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml new file mode 100644 index 0000000000..27eb120a8a --- /dev/null +++ b/src/cpu_map/x86_IvyBridge-IBRS.xml @@ -0,0 +1,51 @@ +<cpus> + <model name='IvyBridge-IBRS'> + <signature family='6' model='58'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <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='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml new file mode 100644 index 0000000000..54f5f55a51 --- /dev/null +++ b/src/cpu_map/x86_IvyBridge.xml @@ -0,0 +1,50 @@ +<cpus> + <model name='IvyBridge'> + <signature family='6' model='58'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <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='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml new file mode 100644 index 0000000000..f2230ffa89 --- /dev/null +++ b/src/cpu_map/x86_Nehalem-IBRS.xml @@ -0,0 +1,38 @@ +<cpus> + <model name='Nehalem-IBRS'> + <signature family='6' model='26'/> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <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'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml new file mode 100644 index 0000000000..8e0fd5dc49 --- /dev/null +++ b/src/cpu_map/x86_Nehalem.xml @@ -0,0 +1,37 @@ +<cpus> + <model name='Nehalem'> + <signature family='6' model='26'/> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Opteron_G1.xml b/src/cpu_map/x86_Opteron_G1.xml new file mode 100644 index 0000000000..8d043fe889 --- /dev/null +++ b/src/cpu_map/x86_Opteron_G1.xml @@ -0,0 +1,31 @@ +<cpus> + <model name='Opteron_G1'> + <signature family='15' model='6'/> + <vendor name='AMD'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Opteron_G2.xml b/src/cpu_map/x86_Opteron_G2.xml new file mode 100644 index 0000000000..774e86462f --- /dev/null +++ b/src/cpu_map/x86_Opteron_G2.xml @@ -0,0 +1,35 @@ +<cpus> + <model name='Opteron_G2'> + <signature family='15' model='6'/> + <vendor name='AMD'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml new file mode 100644 index 0000000000..5d27e635dc --- /dev/null +++ b/src/cpu_map/x86_Opteron_G3.xml @@ -0,0 +1,40 @@ +<cpus> + <model name='Opteron_G3'> + <signature family='15' model='6'/> + <vendor name='AMD'/> + <feature name='abm'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='monitor'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4a'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Opteron_G4.xml b/src/cpu_map/x86_Opteron_G4.xml new file mode 100644 index 0000000000..d77cc286ff --- /dev/null +++ b/src/cpu_map/x86_Opteron_G4.xml @@ -0,0 +1,50 @@ +<cpus> + <model name='Opteron_G4'> + <signature family='21' model='1'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fma4'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <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='rdtscp'/> + <feature name='sep'/> + <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='xop'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Opteron_G5.xml b/src/cpu_map/x86_Opteron_G5.xml new file mode 100644 index 0000000000..9a5ecbd4da --- /dev/null +++ b/src/cpu_map/x86_Opteron_G5.xml @@ -0,0 +1,53 @@ +<cpus> + <model name='Opteron_G5'> + <signature family='21' model='2'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fma4'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <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='rdtscp'/> + <feature name='sep'/> + <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='tbm'/> + <feature name='tsc'/> + <feature name='xop'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Penryn.xml b/src/cpu_map/x86_Penryn.xml new file mode 100644 index 0000000000..9b0c0cfd0e --- /dev/null +++ b/src/cpu_map/x86_Penryn.xml @@ -0,0 +1,35 @@ +<cpus> + <model name='Penryn'> + <signature family='6' model='23'/> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml new file mode 100644 index 0000000000..1f56b4bc81 --- /dev/null +++ b/src/cpu_map/x86_SandyBridge-IBRS.xml @@ -0,0 +1,45 @@ +<cpus> + <model name='SandyBridge-IBRS'> + <signature family='6' model='42'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml new file mode 100644 index 0000000000..eea85fc3f3 --- /dev/null +++ b/src/cpu_map/x86_SandyBridge.xml @@ -0,0 +1,44 @@ +<cpus> + <model name='SandyBridge'> + <signature family='6' model='42'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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='x2apic'/> + <feature name='xsave'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml new file mode 100644 index 0000000000..1603bb8c13 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml @@ -0,0 +1,70 @@ +<cpus> + <model name='Skylake-Client-IBRS'> + <signature family='6' model='94'/> + <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='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <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='hle'/> + <feature name='invpcid'/> + <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='pcid'/> + <feature name='pclmuldq'/> + <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='rtm'/> + <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='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml new file mode 100644 index 0000000000..c0286b9fa5 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client.xml @@ -0,0 +1,69 @@ +<cpus> + <model name='Skylake-Client'> + <signature family='6' model='94'/> + <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='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <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='hle'/> + <feature name='invpcid'/> + <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='pcid'/> + <feature name='pclmuldq'/> + <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='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml new file mode 100644 index 0000000000..45350792a0 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml @@ -0,0 +1,77 @@ +<cpus> + <model name='Skylake-Server-IBRS'> + <signature family='6' model='85'/> + <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='hle'/> + <feature name='invpcid'/> + <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='pcid'/> + <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='rtm'/> + <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='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml new file mode 100644 index 0000000000..0119428357 --- /dev/null +++ b/src/cpu_map/x86_Skylake-Server.xml @@ -0,0 +1,76 @@ +<cpus> + <model name='Skylake-Server'> + <signature family='6' model='85'/> + <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='hle'/> + <feature name='invpcid'/> + <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='pcid'/> + <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='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <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='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml new file mode 100644 index 0000000000..dea7a73dcd --- /dev/null +++ b/src/cpu_map/x86_Westmere-IBRS.xml @@ -0,0 +1,39 @@ +<cpus> + <model name='Westmere-IBRS'> + <signature family='6' model='44'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <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'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml new file mode 100644 index 0000000000..f5c31449e0 --- /dev/null +++ b/src/cpu_map/x86_Westmere.xml @@ -0,0 +1,38 @@ +<cpus> + <model name='Westmere'> + <signature family='6' model='44'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_athlon.xml b/src/cpu_map/x86_athlon.xml new file mode 100644 index 0000000000..0d44508e20 --- /dev/null +++ b/src/cpu_map/x86_athlon.xml @@ -0,0 +1,28 @@ +<cpus> + <model name='athlon'> + <vendor name='AMD'/> + <feature name='3dnow'/> + <feature name='3dnowext'/> + <feature name='apic'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_core2duo.xml b/src/cpu_map/x86_core2duo.xml new file mode 100644 index 0000000000..3c9a148f3c --- /dev/null +++ b/src/cpu_map/x86_core2duo.xml @@ -0,0 +1,33 @@ +<cpus> + <model name='core2duo'> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='monitor'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_coreduo.xml b/src/cpu_map/x86_coreduo.xml new file mode 100644 index 0000000000..676e846920 --- /dev/null +++ b/src/cpu_map/x86_coreduo.xml @@ -0,0 +1,29 @@ +<cpus> + <model name='coreduo'> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='monitor'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_cpu64-rhel5.xml b/src/cpu_map/x86_cpu64-rhel5.xml new file mode 100644 index 0000000000..670a92f274 --- /dev/null +++ b/src/cpu_map/x86_cpu64-rhel5.xml @@ -0,0 +1,29 @@ +<cpus> + <model name='cpu64-rhel5'> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_cpu64-rhel6.xml b/src/cpu_map/x86_cpu64-rhel6.xml new file mode 100644 index 0000000000..3cae0f00c2 --- /dev/null +++ b/src/cpu_map/x86_cpu64-rhel6.xml @@ -0,0 +1,31 @@ +<cpus> + <model name='cpu64-rhel6'> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml new file mode 100644 index 0000000000..109c653dbc --- /dev/null +++ b/src/cpu_map/x86_features.xml @@ -0,0 +1,440 @@ +<cpus> + <!-- standard features, EDX --> + <feature name='fpu'> + <cpuid eax_in='0x01' edx='0x00000001'/> + </feature> + <feature name='vme'> + <cpuid eax_in='0x01' edx='0x00000002'/> + </feature> + <feature name='de'> + <cpuid eax_in='0x01' edx='0x00000004'/> + </feature> + <feature name='pse'> + <cpuid eax_in='0x01' edx='0x00000008'/> + </feature> + <feature name='tsc'> + <cpuid eax_in='0x01' edx='0x00000010'/> + </feature> + <feature name='msr'> + <cpuid eax_in='0x01' edx='0x00000020'/> + </feature> + <feature name='pae'> + <cpuid eax_in='0x01' edx='0x00000040'/> + </feature> + <feature name='mce'> + <cpuid eax_in='0x01' edx='0x00000080'/> + </feature> + <feature name='cx8'> + <cpuid eax_in='0x01' edx='0x00000100'/> + </feature> + <feature name='apic'> + <cpuid eax_in='0x01' edx='0x00000200'/> + </feature> + <feature name='sep'> + <cpuid eax_in='0x01' edx='0x00000800'/> + </feature> + <feature name='mtrr'> + <cpuid eax_in='0x01' edx='0x00001000'/> + </feature> + <feature name='pge'> + <cpuid eax_in='0x01' edx='0x00002000'/> + </feature> + <feature name='mca'> + <cpuid eax_in='0x01' edx='0x00004000'/> + </feature> + <feature name='cmov'> + <cpuid eax_in='0x01' edx='0x00008000'/> + </feature> + <feature name='pat'> + <cpuid eax_in='0x01' edx='0x00010000'/> + </feature> + <feature name='pse36'> + <cpuid eax_in='0x01' edx='0x00020000'/> + </feature> + <feature name='pn'> + <cpuid eax_in='0x01' edx='0x00040000'/> + </feature> + <feature name='clflush'> + <cpuid eax_in='0x01' edx='0x00080000'/> + </feature> + <feature name='ds'> + <cpuid eax_in='0x01' edx='0x00200000'/> + </feature> + <feature name='acpi'> + <cpuid eax_in='0x01' edx='0x00400000'/> + </feature> + <feature name='mmx'> + <cpuid eax_in='0x01' edx='0x00800000'/> + </feature> + <feature name='fxsr'> + <cpuid eax_in='0x01' edx='0x01000000'/> + </feature> + <feature name='sse'> + <cpuid eax_in='0x01' edx='0x02000000'/> + </feature> + <feature name='sse2'> + <cpuid eax_in='0x01' edx='0x04000000'/> + </feature> + <feature name='ss'> + <cpuid eax_in='0x01' edx='0x08000000'/> + </feature> + <feature name='ht'> + <cpuid eax_in='0x01' edx='0x10000000'/> + </feature> + <feature name='tm'> + <cpuid eax_in='0x01' edx='0x20000000'/> + </feature> + <feature name='ia64'> + <cpuid eax_in='0x01' edx='0x40000000'/> + </feature> + <feature name='pbe'> + <cpuid eax_in='0x01' edx='0x80000000'/> + </feature> + + <!-- standard features, ECX --> + <feature name='pni'> <!-- sse3 --> + <cpuid eax_in='0x01' ecx='0x00000001'/> + </feature> + <feature name='pclmuldq'> <!-- pclmulqdq --> + <cpuid eax_in='0x01' ecx='0x00000002'/> + </feature> + <feature name='dtes64'> + <cpuid eax_in='0x01' ecx='0x00000004'/> + </feature> + <feature name='monitor'> + <cpuid eax_in='0x01' ecx='0x00000008'/> + </feature> + <feature name='ds_cpl'> <!-- ds-cpl --> + <cpuid eax_in='0x01' ecx='0x00000010'/> + </feature> + <feature name='vmx'> + <cpuid eax_in='0x01' ecx='0x00000020'/> + </feature> + <feature name='smx'> + <cpuid eax_in='0x01' ecx='0x00000040'/> + </feature> + <feature name='est'> + <cpuid eax_in='0x01' ecx='0x00000080'/> + </feature> + <feature name='tm2'> + <cpuid eax_in='0x01' ecx='0x00000100'/> + </feature> + <feature name='ssse3'> + <cpuid eax_in='0x01' ecx='0x00000200'/> + </feature> + <feature name='cid'> + <cpuid eax_in='0x01' ecx='0x00000400'/> + </feature> + <feature name='fma'> + <cpuid eax_in='0x01' ecx='0x00001000'/> + </feature> + <feature name='cx16'> + <cpuid eax_in='0x01' ecx='0x00002000'/> + </feature> + <feature name='xtpr'> + <cpuid eax_in='0x01' ecx='0x00004000'/> + </feature> + <feature name='pdcm'> + <cpuid eax_in='0x01' ecx='0x00008000'/> + </feature> + <feature name='pcid'> + <cpuid eax_in='0x01' ecx='0x00020000'/> + </feature> + <feature name='dca'> + <cpuid eax_in='0x01' ecx='0x00040000'/> + </feature> + <feature name='sse4.1'> <!-- sse4-1, sse4_1 --> + <cpuid eax_in='0x01' ecx='0x00080000'/> + </feature> + <feature name='sse4.2'> <!-- sse4-2, sse4_2 --> + <cpuid eax_in='0x01' ecx='0x00100000'/> + </feature> + <feature name='x2apic'> + <cpuid eax_in='0x01' ecx='0x00200000'/> + </feature> + <feature name='movbe'> + <cpuid eax_in='0x01' ecx='0x00400000'/> + </feature> + <feature name='popcnt'> + <cpuid eax_in='0x01' ecx='0x00800000'/> + </feature> + <feature name='tsc-deadline'> + <cpuid eax_in='0x01' ecx='0x01000000'/> + </feature> + <feature name='aes'> + <cpuid eax_in='0x01' ecx='0x02000000'/> + </feature> + <feature name='xsave'> + <cpuid eax_in='0x01' ecx='0x04000000'/> + </feature> + <feature name='osxsave'> + <cpuid eax_in='0x01' ecx='0x08000000'/> + </feature> + <feature name='avx'> + <cpuid eax_in='0x01' ecx='0x10000000'/> + </feature> + <feature name='f16c'> + <cpuid eax_in='0x01' ecx='0x20000000'/> + </feature> + <feature name='rdrand'> + <cpuid eax_in='0x01' ecx='0x40000000'/> + </feature> + <feature name='hypervisor'> + <cpuid eax_in='0x01' ecx='0x80000000'/> + </feature> + + <!-- Termal Power and Management --> + <feature name='arat'> + <cpuid eax_in='0x06' eax='0x00000004'/> + </feature> + + <!-- cpuid function 0x7 ecx 0x0 features --> + <feature name='fsgsbase'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000001'/> + </feature> + <feature name='tsc_adjust'> <!-- tsc-adjust --> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000002'/> + </feature> + <feature name='bmi1'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000008'/> + </feature> + <feature name='hle'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000010'/> + </feature> + <feature name='avx2'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000020'/> + </feature> + <feature name='smep'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000080'/> + </feature> + <feature name='bmi2'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000100'/> + </feature> + <feature name='erms'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000200'/> + </feature> + <feature name='invpcid'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000400'/> + </feature> + <feature name='rtm'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000800'/> + </feature> + <feature name='cmt'> <!-- cqm --> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00001000'/> + </feature> + <feature name='mpx'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00004000'/> + </feature> + <feature name='avx512f'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00010000'/> + </feature> + <feature name='avx512dq'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00020000'/> + </feature> + <feature name='rdseed'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00040000'/> + </feature> + <feature name='adx'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00080000'/> + </feature> + <feature name='smap'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00100000'/> + </feature> + <feature name='avx512ifma'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00200000'/> + </feature> + <feature name='pcommit'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00400000'/> + </feature> + <feature name='clflushopt'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00800000'/> + </feature> + <feature name='clwb'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/> + </feature> + <feature name='avx512pf'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/> + </feature> + <feature name='avx512er'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x08000000'/> + </feature> + <feature name='avx512cd'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x10000000'/> + </feature> + <feature name='sha-ni'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x20000000'/> + </feature> + <feature name='avx512bw'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x40000000'/> + </feature> + <feature name='avx512vl'> + <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x80000000'/> + </feature> + + <feature name='avx512vbmi'> + <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/> + </feature> + <feature name='pku'> + <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/> + </feature> + <feature name='ospke'> + <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/> + </feature> + <feature name='la57'> + <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/> + </feature> + + <feature name='avx512-4vnniw'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/> + </feature> + <feature name='avx512-4fmaps'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/> + </feature> + <feature name='spec-ctrl'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/> + </feature> + <feature name='ssbd'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/> + </feature> + + <!-- Processor Extended State Enumeration sub leaf 1 --> + <feature name='xsaveopt'> + <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/> + </feature> + <feature name='xsavec'> + <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000002'/> + </feature> + <feature name='xgetbv1'> + <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000004'/> + </feature> + <feature name='xsaves' migratable='no'> + <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/> + </feature> + + <!-- cpuid level 0x0000000f:1 (edx) --> + <feature name='mbm_total'> + <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/> + </feature> + <feature name='mbm_local'> + <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/> + </feature> + + <!-- extended features, EDX --> + <feature name='syscall'> + <cpuid eax_in='0x80000001' edx='0x00000800'/> + </feature> + <feature name='nx'> <!-- xd --> + <cpuid eax_in='0x80000001' edx='0x00100000'/> + </feature> + <feature name='mmxext'> + <cpuid eax_in='0x80000001' edx='0x00400000'/> + </feature> + <feature name='fxsr_opt'> <!-- ffxsr, fxsr-opt --> + <cpuid eax_in='0x80000001' edx='0x02000000'/> + </feature> + <feature name='pdpe1gb'> + <cpuid eax_in='0x80000001' edx='0x04000000'/> + </feature> + <feature name='rdtscp'> + <cpuid eax_in='0x80000001' edx='0x08000000'/> + </feature> + <feature name='lm'> <!-- i64 --> + <cpuid eax_in='0x80000001' edx='0x20000000'/> + </feature> + <feature name='3dnowext'> + <cpuid eax_in='0x80000001' edx='0x40000000'/> + </feature> + <feature name='3dnow'> + <cpuid eax_in='0x80000001' edx='0x80000000'/> + </feature> + + <!-- extended features, ECX --> + <feature name='lahf_lm'> <!-- lahf-lm --> + <cpuid eax_in='0x80000001' ecx='0x00000001'/> + </feature> + <feature name='cmp_legacy'> <!-- cmp-legacy --> + <cpuid eax_in='0x80000001' ecx='0x00000002'/> + </feature> + <feature name='svm'> + <cpuid eax_in='0x80000001' ecx='0x00000004'/> + </feature> + <feature name='extapic'> + <cpuid eax_in='0x80000001' ecx='0x00000008'/> + </feature> + <feature name='cr8legacy'> + <cpuid eax_in='0x80000001' ecx='0x00000010'/> + </feature> + <feature name='abm'> + <cpuid eax_in='0x80000001' ecx='0x00000020'/> + </feature> + <feature name='sse4a'> + <cpuid eax_in='0x80000001' ecx='0x00000040'/> + </feature> + <feature name='misalignsse'> + <cpuid eax_in='0x80000001' ecx='0x00000080'/> + </feature> + <feature name='3dnowprefetch'> + <cpuid eax_in='0x80000001' ecx='0x00000100'/> + </feature> + <feature name='osvw'> + <cpuid eax_in='0x80000001' ecx='0x00000200'/> + </feature> + <feature name='ibs'> + <cpuid eax_in='0x80000001' ecx='0x00000400'/> + </feature> + <feature name='xop'> + <cpuid eax_in='0x80000001' ecx='0x00000800'/> + </feature> + <feature name='skinit'> + <cpuid eax_in='0x80000001' ecx='0x00001000'/> + </feature> + <feature name='wdt'> + <cpuid eax_in='0x80000001' ecx='0x00002000'/> + </feature> + <feature name='lwp'> + <cpuid eax_in='0x80000001' ecx='0x00008000'/> + </feature> + <feature name='fma4'> + <cpuid eax_in='0x80000001' ecx='0x00010000'/> + </feature> + <feature name='tce'> + <cpuid eax_in='0x80000001' ecx='0x00020000'/> + </feature> + <feature name='cvt16'> + <cpuid eax_in='0x80000001' ecx='0x00040000'/> + </feature> + <feature name='nodeid_msr'> <!-- nodeid-msr --> + <cpuid eax_in='0x80000001' ecx='0x00080000'/> + </feature> + <feature name='tbm'> + <cpuid eax_in='0x80000001' ecx='0x00200000'/> + </feature> + <feature name='topoext'> + <cpuid eax_in='0x80000001' ecx='0x00400000'/> + </feature> + <feature name='perfctr_core'> <!-- perfctr-core --> + <cpuid eax_in='0x80000001' ecx='0x00800000'/> + </feature> + <feature name='perfctr_nb'> <!-- perfctr-nb --> + <cpuid eax_in='0x80000001' ecx='0x01000000'/> + </feature> + + <!-- Advanced Power Management edx features --> + <feature name='invtsc' migratable='no'> + <cpuid eax_in='0x80000007' edx='0x00000100'/> + </feature> + + <!-- More AMD-specific features --> + <feature name='ibpb'> + <cpuid eax_in='0x80000008' ebx='0x00001000'/> + </feature> + <feature name='amd-ssbd'> + <cpuid eax_in='0x80000008' ebx='0x01000000'/> + </feature> + <feature name='virt-ssbd'> + <cpuid eax_in='0x80000008' ebx='0x02000000'/> + </feature> + <feature name='amd-no-ssb'> + <cpuid eax_in='0x80000008' ebx='0x04000000'/> + </feature> +</cpus> diff --git a/src/cpu_map/x86_kvm32.xml b/src/cpu_map/x86_kvm32.xml new file mode 100644 index 0000000000..5f08a5e7fc --- /dev/null +++ b/src/cpu_map/x86_kvm32.xml @@ -0,0 +1,26 @@ +<cpus> + <model name='kvm32'> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_kvm64.xml b/src/cpu_map/x86_kvm64.xml new file mode 100644 index 0000000000..80b24e2a49 --- /dev/null +++ b/src/cpu_map/x86_kvm64.xml @@ -0,0 +1,30 @@ +<cpus> + <model name='kvm64'> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_n270.xml b/src/cpu_map/x86_n270.xml new file mode 100644 index 0000000000..cb359d968e --- /dev/null +++ b/src/cpu_map/x86_n270.xml @@ -0,0 +1,30 @@ +<cpus> + <model name='n270'> + <vendor name='Intel'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='monitor'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='ssse3'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_pentium.xml b/src/cpu_map/x86_pentium.xml new file mode 100644 index 0000000000..d44c1399b0 --- /dev/null +++ b/src/cpu_map/x86_pentium.xml @@ -0,0 +1,13 @@ +<cpus> + <model name='pentium'> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='pse'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_pentium2.xml b/src/cpu_map/x86_pentium2.xml new file mode 100644 index 0000000000..0d772bad2f --- /dev/null +++ b/src/cpu_map/x86_pentium2.xml @@ -0,0 +1,22 @@ +<cpus> + <model name='pentium2'> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_pentium3.xml b/src/cpu_map/x86_pentium3.xml new file mode 100644 index 0000000000..24eb227c28 --- /dev/null +++ b/src/cpu_map/x86_pentium3.xml @@ -0,0 +1,23 @@ +<cpus> + <model name='pentium3'> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='tsc'/> + <feature name='vme'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_pentiumpro.xml b/src/cpu_map/x86_pentiumpro.xml new file mode 100644 index 0000000000..9f7a610a87 --- /dev/null +++ b/src/cpu_map/x86_pentiumpro.xml @@ -0,0 +1,21 @@ +<cpus> + <model name='pentiumpro'> + <feature name='apic'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pse'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_phenom.xml b/src/cpu_map/x86_phenom.xml new file mode 100644 index 0000000000..71f004057b --- /dev/null +++ b/src/cpu_map/x86_phenom.xml @@ -0,0 +1,36 @@ +<cpus> + <model name='phenom'> + <vendor name='AMD'/> + <feature name='3dnow'/> + <feature name='3dnowext'/> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='monitor'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_qemu32.xml b/src/cpu_map/x86_qemu32.xml new file mode 100644 index 0000000000..3c9cdec981 --- /dev/null +++ b/src/cpu_map/x86_qemu32.xml @@ -0,0 +1,22 @@ +<cpus> + <model name='qemu32'> + <feature name='apic'/> + <feature name='cmov'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='tsc'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_qemu64.xml b/src/cpu_map/x86_qemu64.xml new file mode 100644 index 0000000000..ed3b8d54e2 --- /dev/null +++ b/src/cpu_map/x86_qemu64.xml @@ -0,0 +1,40 @@ +<cpus> + <model name='qemu64'> + <!-- These are supported only by TCG. KVM supports them only if the + host does. So we leave them out: + +<feature name='abm'/> +<feature name='lahf_lm'/> +<feature name='popcnt'/> +<feature name='sse4a'/> + --> + <feature name='apic'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='sep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + </model> + +</cpus> diff --git a/src/cpu_map/x86_vendors.xml b/src/cpu_map/x86_vendors.xml new file mode 100644 index 0000000000..418712af21 --- /dev/null +++ b/src/cpu_map/x86_vendors.xml @@ -0,0 +1,4 @@ +<cpus> + <vendor name='Intel' string='GenuineIntel'/> + <vendor name='AMD' string='AuthenticAMD'/> +</cpus> -- 2.17.1

A generic "failed to parse xml document" message without telling us which XML file failed is quite unhelpful. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/util/virxml.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index a03a747e60..d1926f4605 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -847,7 +847,8 @@ virXMLParseHelper(int domcode, if (virGetLastErrorCode() == VIR_ERR_OK) { virGenericReportError(domcode, VIR_ERR_XML_ERROR, - "%s", _("failed to parse xml document")); + _("failed to parse xml document '%s'"), + filename ? filename : "[inline data]"); } goto cleanup; } -- 2.17.1