From nobody Fri May 17 06:43:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1655217613; cv=none; d=zohomail.com; s=zohoarc; b=dqzdO5sXGxWnUKgtiE/sYbKujUbLmdqdZq9v/OgQkdzAy65r8P/wgHG+V7P3XxLPb0QPdf5xXkDCp9hmor8qw7IXtuKfVkRLgsVTtsJvBKF4QDSr3e0GdjUWE/SQ39sTJOeXpPx8HJs1kYZ9zKm/oo4NBFBrclxF6VIvQZJQle0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655217613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=yJ/bHU6exD+QtioBlvmmM2XJZbOkDWCbhPz/0Szs0oM=; b=HmaxZGLhOEJwwdvMIo78tKD74h4eEjdJ7C3vFGwgdk3fxCkbpnR3N3k+ZQJpIMW6TK7W8HxMyeCh/S88GZnTIYtQKHKjg6nezq6mMCZRnJQDbaOMJ2BdVmeLi9dokMRJIZ3eL/eHfctUjavsa8xNkAF3eEXXYEFZUOqXKF4Csis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1655217613680722.1417720862414; Tue, 14 Jun 2022 07:40:13 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-bI_DKUoSP-yhjYUru0WpWg-1; Tue, 14 Jun 2022 10:40:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C6683C1014B; Tue, 14 Jun 2022 14:40:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBBBDC28112; Tue, 14 Jun 2022 14:40:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 79AF41947076; Tue, 14 Jun 2022 14:40:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8758A1947067 for ; Tue, 14 Jun 2022 14:40:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 62D801121320; Tue, 14 Jun 2022 14:40:00 +0000 (UTC) Received: from colepc.home (unknown [10.22.8.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22D3B1121314; Tue, 14 Jun 2022 14:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655217612; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=yJ/bHU6exD+QtioBlvmmM2XJZbOkDWCbhPz/0Szs0oM=; b=MrhWD9M134v5OaCo3fXnOvdfnd3UVxOgS/851CRDk7ceYN322xEzw0wQ3X8w8trZMGV4bf 7zfeM95YmjQK6mbvPe8odgl1qHJqH4gTXM0bs94/5pFUDcqaBeJg/KgPZutQgIYBYousA7 fq0ysjh+hhAeOXA1tr4pR+eWvQvY9c4= X-MC-Unique: bI_DKUoSP-yhjYUru0WpWg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH v2] conf: cpu: Add Date: Tue, 14 Jun 2022 10:39:52 -0400 Message-Id: <4e4d1b2d4ebb00e1ba09c524d011c26a277198af.1655217404.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Denemark , Cole Robinson Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655217614436100001 Content-Type: text/plain; charset="utf-8" Internally we already collect x86 host family + model + stepping numeric values. This exposed them in capabilities CPU output. Example: $ sudo virsh capabilities | grep -A1 -B1 signature Users need to know these values to calculate an expected. SEV-ES/SEV-SNP launch measurement. Signed-off-by: Cole Robinson Reviewed-by: Jiri Denemark --- v2: sigXXX naming was kept, since there's a conflicting 'model' member in the struct already. Addressed Jirka's review comments src/conf/cpu_conf.c | 32 +++++++++++++++++++ src/conf/cpu_conf.h | 3 ++ src/conf/schemas/cputypes.rng | 13 ++++++++ src/cpu/cpu_x86.c | 3 ++ .../x86_64-cpuid-A10-5800K-host.xml | 1 + .../x86_64-cpuid-Atom-D510-host.xml | 1 + .../x86_64-cpuid-Atom-N450-host.xml | 1 + .../x86_64-cpuid-Atom-P5362-host.xml | 1 + .../x86_64-cpuid-Cooperlake-host.xml | 1 + .../x86_64-cpuid-Core-i5-2500-host.xml | 1 + .../x86_64-cpuid-Core-i5-2540M-host.xml | 1 + .../x86_64-cpuid-Core-i5-4670T-host.xml | 1 + .../x86_64-cpuid-Core-i5-650-host.xml | 1 + .../x86_64-cpuid-Core-i5-6600-host.xml | 1 + .../x86_64-cpuid-Core-i7-2600-host.xml | 1 + ...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 1 + .../x86_64-cpuid-Core-i7-3520M-host.xml | 1 + .../x86_64-cpuid-Core-i7-3740QM-host.xml | 1 + .../x86_64-cpuid-Core-i7-3770-host.xml | 1 + .../x86_64-cpuid-Core-i7-4510U-host.xml | 1 + .../x86_64-cpuid-Core-i7-4600U-host.xml | 1 + .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 1 + .../x86_64-cpuid-Core-i7-5600U-host.xml | 1 + .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-host.xml | 1 + .../x86_64-cpuid-Core-i7-7700-host.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-host.xml | 1 + .../x86_64-cpuid-Core-i7-8700-host.xml | 1 + .../x86_64-cpuid-Core2-E6850-host.xml | 1 + .../x86_64-cpuid-Core2-Q9500-host.xml | 1 + .../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + .../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 1 + ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 1 + .../cputestdata/x86_64-cpuid-FX-8150-host.xml | 1 + ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + .../x86_64-cpuid-Opteron-1352-host.xml | 1 + .../x86_64-cpuid-Opteron-2350-host.xml | 1 + .../x86_64-cpuid-Opteron-6234-host.xml | 1 + .../x86_64-cpuid-Opteron-6282-host.xml | 1 + .../x86_64-cpuid-Pentium-P6100-host.xml | 1 + .../x86_64-cpuid-Phenom-B95-host.xml | 1 + ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 1 + ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 + .../x86_64-cpuid-Xeon-5110-host.xml | 1 + .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 + .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 1 + .../x86_64-cpuid-Xeon-E7-4820-host.xml | 1 + .../x86_64-cpuid-Xeon-E7-4830-host.xml | 1 + .../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 1 + .../x86_64-cpuid-Xeon-E7540-host.xml | 1 + .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 + .../x86_64-cpuid-Xeon-W3520-host.xml | 1 + .../x86_64-cpuid-Xeon-X5460-host.xml | 1 + 65 files changed, 112 insertions(+) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 2d447da7c3..8774a625ab 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -245,6 +245,9 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) copy->threads =3D cpu->threads; copy->arch =3D cpu->arch; copy->migratable =3D cpu->migratable; + copy->sigFamily =3D cpu->sigFamily; + copy->sigModel =3D cpu->sigModel; + copy->sigStepping =3D cpu->sigStepping; =20 if (cpu->cache) { copy->cache =3D g_new0(virCPUCacheDef, 1); @@ -421,6 +424,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, if (def->type =3D=3D VIR_CPU_TYPE_HOST) { g_autofree char *arch =3D virXPathString("string(./arch[1])", ctxt= ); xmlNodePtr counter_node =3D NULL; + xmlNodePtr signature_node =3D NULL; =20 if (!arch) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -441,6 +445,26 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } =20 + if ((signature_node =3D virXPathNode("./signature[1]", ctxt))) { + if (virXMLPropUInt(signature_node, "family", 10, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZER= O, + &def->sigFamily) < 0) { + return -1; + } + + if (virXMLPropUInt(signature_node, "model", 10, + VIR_XML_PROP_REQUIRED, + &def->sigModel) < 0) { + return -1; + } + + if (virXMLPropUInt(signature_node, "stepping", 10, + VIR_XML_PROP_REQUIRED, + &def->sigStepping) < 0) { + return -1; + } + } + if ((counter_node =3D virXPathNode("./counter[@name=3D'tsc']", ctx= t))) { tsc =3D g_new0(virHostCPUTscInfo, 1); =20 @@ -753,6 +777,14 @@ virCPUDefFormatBuf(virBuffer *buf, virBufferAsprintf(buf, "\n", def->microcodeVersion); =20 + if (def->type =3D=3D VIR_CPU_TYPE_HOST && def->sigFamily) { + virBufferAddLit(buf, "sigFamily); + virBufferAsprintf(buf, " model=3D'%u'", def->sigModel); + virBufferAsprintf(buf, " stepping=3D'%u'", def->sigStepping); + virBufferAddLit(buf, "/>\n"); + } + if (def->type =3D=3D VIR_CPU_TYPE_HOST && def->tsc) { virBufferAddLit(buf, "tsc->frequency); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 2cda4ee1f4..17867d6a30 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -134,6 +134,9 @@ struct _virCPUDef { unsigned int dies; unsigned int cores; unsigned int threads; + unsigned int sigFamily; + unsigned int sigModel; + unsigned int sigStepping; size_t nfeatures; size_t nfeatures_max; virCPUFeatureDef *features; diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng index 056e66e1b4..122880fb2e 100644 --- a/src/conf/schemas/cputypes.rng +++ b/src/conf/schemas/cputypes.rng @@ -342,6 +342,19 @@ + + + + + + + + + + + + + diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a4aca6055d..c4462f34a7 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2265,6 +2265,9 @@ x86Decode(virCPUDef *cpu, cpuModel->nfeatures =3D 0; cpu->nfeatures_max =3D cpuModel->nfeatures_max; cpuModel->nfeatures_max =3D 0; + cpu->sigFamily =3D sigFamily; + cpu->sigModel =3D sigModel; + cpu->sigStepping =3D sigStepping; =20 return 0; } diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cput= estdata/x86_64-cpuid-A10-5800K-host.xml index 2430adbfbc..220dfb6467 100644 --- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml +++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G5 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cput= estdata/x86_64-cpuid-Atom-D510-host.xml index 8cf4341099..3c8a005122 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml @@ -2,6 +2,7 @@ x86_64 n270 Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cput= estdata/x86_64-cpuid-Atom-N450-host.xml index c79713dcaa..1f4eb7b727 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml @@ -2,6 +2,7 @@ x86_64 n270 Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cpu= testdata/x86_64-cpuid-Atom-P5362-host.xml index b3e9d5c1ff..c59ebfa799 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml @@ -2,6 +2,7 @@ x86_64 Westmere-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cpu= testdata/x86_64-cpuid-Cooperlake-host.xml index b0777181bb..6ac4ad55ef 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml @@ -2,6 +2,7 @@ x86_64 Cooperlake Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i5-2500-host.xml index a604acb911..cf8b175db1 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml @@ -2,6 +2,7 @@ x86_64 SandyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml index a604acb911..cf8b175db1 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml @@ -2,6 +2,7 @@ x86_64 SandyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml index d1d0bc7168..827b16cb69 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell-noTSX Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cp= utestdata/x86_64-cpuid-Core-i5-650-host.xml index e7256d52d0..4234c4df5a 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml @@ -2,6 +2,7 @@ x86_64 Westmere Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i5-6600-host.xml index faaa07f19b..c52e8db235 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i7-2600-host.xml index a604acb911..cf8b175db1 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml @@ -2,6 +2,7 @@ x86_64 SandyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml = b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml index e139004923..adcc4b86c5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml @@ -2,6 +2,7 @@ x86_64 SandyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml index a23c651a08..94352ee8bf 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml @@ -2,6 +2,7 @@ x86_64 IvyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests= /cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml index 9fec131ac9..e2503cd35c 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml @@ -2,6 +2,7 @@ x86_64 IvyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i7-3770-host.xml index a23c651a08..94352ee8bf 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml @@ -2,6 +2,7 @@ x86_64 IvyBridge Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml index 61bcefbfcb..a6307e834e 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml @@ -2,6 +2,7 @@ x86_64 Westmere Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml index fae8e8d0a8..8bbac47a2e 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell-noTSX Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/t= ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml index ea622c87c7..b39148f37f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml index ea622c87c7..b39148f37f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/t= ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml index a534d2dec5..2ab8890464 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml index bbdfb6aa61..edfb8ec421 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i7-7700-host.xml index faaa07f19b..08255621ec 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml index 7681c94649..1e3f1d1719 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client-noTSX-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/c= putestdata/x86_64-cpuid-Core-i7-8700-host.xml index bbdfb6aa61..4174d79ce7 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cp= utestdata/x86_64-cpuid-Core2-E6850-host.xml index e7ddc39ceb..e0ec4cd795 100644 --- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml @@ -2,6 +2,7 @@ x86_64 Conroe Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cp= utestdata/x86_64-cpuid-Core2-Q9500-host.xml index 4dc25588d5..586b8e0f59 100644 --- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml @@ -2,6 +2,7 @@ x86_64 Penryn Intel + diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/te= sts/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml index 9f8108cdaa..debddc194f 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml @@ -2,6 +2,7 @@ x86_64 EPYC-Rome AMD + diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/te= sts/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml index 8c2c975fdd..da05dd4709 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml @@ -2,6 +2,7 @@ x86_64 EPYC AMD + diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml= b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml index c3bbf78396..e91c14c715 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml @@ -2,6 +2,7 @@ x86_64 EPYC-IBPB AMD + diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputes= tdata/x86_64-cpuid-FX-8150-host.xml index 75595c02af..4fb2d3978b 100644 --- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml +++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G4 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml= b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml index 76c3753505..d06a7afc3f 100644 --- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml @@ -2,6 +2,7 @@ x86_64 Dhyana Hygon + diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/test= s/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml index 07e8f8bc24..2ce74da604 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml @@ -2,6 +2,7 @@ x86_64 Icelake-Server Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/c= putestdata/x86_64-cpuid-Opteron-1352-host.xml index ecd532167a..7b0b3dfe6a 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G3 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/c= putestdata/x86_64-cpuid-Opteron-2350-host.xml index ecd532167a..7b0b3dfe6a 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G3 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/c= putestdata/x86_64-cpuid-Opteron-6234-host.xml index 75595c02af..4fb2d3978b 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G4 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/c= putestdata/x86_64-cpuid-Opteron-6282-host.xml index 75595c02af..4fb2d3978b 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml @@ -2,6 +2,7 @@ x86_64 Opteron_G4 AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/= cputestdata/x86_64-cpuid-Pentium-P6100-host.xml index 3975aa7e1f..a70f8ccd46 100644 --- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml @@ -2,6 +2,7 @@ x86_64 core2duo Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cpu= testdata/x86_64-cpuid-Phenom-B95-host.xml index 95875918c9..dba7b2b161 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml @@ -2,6 +2,7 @@ x86_64 athlon AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.x= ml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml index 8c2c975fdd..15ec20bd63 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml @@ -2,6 +2,7 @@ x86_64 EPYC AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml = b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml index 65eaeabdd0..7f86683bf2 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml @@ -2,6 +2,7 @@ x86_64 EPYC-Rome AMD + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cput= estdata/x86_64-cpuid-Xeon-5110-host.xml index ca3a84cc5c..beb465df86 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml @@ -2,6 +2,7 @@ x86_64 Conroe Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml index e7ced42797..d4a2a15e60 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml index faaa07f19b..c52e8db235 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Client Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml index 9bac4b4648..bc39536de9 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell-noTSX-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml index 43a0b93ab4..70419d7944 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml index 431a737a44..6d959eedc3 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell-noTSX Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml index 5dd8d749de..e2ace9021b 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E5-2650-host.xml index 80ca6c343f..628900fd2c 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml @@ -2,6 +2,7 @@ x86_64 SandyBridge-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml index 431a737a44..6d959eedc3 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell-noTSX Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml index 5dd8d749de..e2ace9021b 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml @@ -2,6 +2,7 @@ x86_64 Broadwell Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E7-4820-host.xml index 52902479b9..58468cd096 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml @@ -2,6 +2,7 @@ x86_64 Westmere Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E7-4830-host.xml index 52902479b9..58468cd096 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml @@ -2,6 +2,7 @@ x86_64 Westmere Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml index e90598ec63..6a18204c02 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml @@ -2,6 +2,7 @@ x86_64 Haswell Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cpu= testdata/x86_64-cpuid-Xeon-E7540-host.xml index 42b43116bd..ee526e7119 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml @@ -2,6 +2,7 @@ x86_64 Nehalem-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests= /cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml index 9de76fd640..e004747ada 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Server-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests= /cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml index 207e9e0ee4..fba4ccf506 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Server-IBRS Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests= /cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml index b18ceddc60..da7e96e533 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml @@ -2,6 +2,7 @@ x86_64 Skylake-Server Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/t= ests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml index fdeafc4870..96effe5684 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml @@ -2,6 +2,7 @@ x86_64 Cascadelake-Server Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/t= ests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml index 01447f3478..ea51fc40a1 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml @@ -2,6 +2,7 @@ x86_64 Cascadelake-Server Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cpu= testdata/x86_64-cpuid-Xeon-W3520-host.xml index c4a9226973..35dd63f360 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml @@ -2,6 +2,7 @@ x86_64 Nehalem Intel + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cpu= testdata/x86_64-cpuid-Xeon-X5460-host.xml index e73c4780c9..91ab9726da 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml @@ -2,6 +2,7 @@ x86_64 Penryn Intel + --=20 2.36.1