From nobody Sat Apr 27 13:34:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150965274866785.30078325666636; Thu, 2 Nov 2017 12:59:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56192C04AC57; Thu, 2 Nov 2017 19:59:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3D1260619; Thu, 2 Nov 2017 19:59:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 394C31800BCD; Thu, 2 Nov 2017 19:59:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA2Jvivn029109 for ; Thu, 2 Nov 2017 15:57:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E40C5D759; Thu, 2 Nov 2017 19:57:44 +0000 (UTC) Received: from mamuti.net (ovpn-204-160.brq.redhat.com [10.40.204.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0FBB35D75E for ; Thu, 2 Nov 2017 19:57:39 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 50E21100500; Thu, 2 Nov 2017 20:57:38 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 56192C04AC57 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Thu, 2 Nov 2017 20:57:35 +0100 Message-Id: <18d2165c9bba4623a7df3ce56ae6561f9467c081.1509652558.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] cputest: Do not drop v[0-9] from CPU names X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 02 Nov 2017 19:59:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Version is a significant part of some Xeon CPUs. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- tests/cputest.c | 8 ++++= ---- tests/cputestdata/cpu-parse.sh | 2 +- ...245-disabled.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml} | 0 ...-1245-enabled.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml} | 0 ...n-E3-1245-guest.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5-guest.xml} | 0 ...eon-E3-1245-host.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5-host.xml} | 0 ...eon-E3-1245-json.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5-json.xml} | 0 ...-cpuid-Xeon-E3-1245.json =3D> x86_64-cpuid-Xeon-E3-1245-v5.json} | 0 ...64-cpuid-Xeon-E3-1245.xml =3D> x86_64-cpuid-Xeon-E3-1245-v5.xml} | 0 ...630-disabled.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml} | 0 ...-2630-enabled.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml} | 0 ...n-E5-2630-guest.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3-guest.xml} | 0 ...eon-E5-2630-host.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3-host.xml} | 0 ...eon-E5-2630-json.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3-json.xml} | 0 ...-cpuid-Xeon-E5-2630.json =3D> x86_64-cpuid-Xeon-E5-2630-v3.json} | 0 ...64-cpuid-Xeon-E5-2630.xml =3D> x86_64-cpuid-Xeon-E5-2630-v3.xml} | 0 ...650-disabled.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml} | 0 ...-2650-enabled.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml} | 0 ...n-E5-2650-guest.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3-guest.xml} | 0 ...eon-E5-2650-host.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3-host.xml} | 0 ...eon-E5-2650-json.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3-json.xml} | 0 ...-cpuid-Xeon-E5-2650.json =3D> x86_64-cpuid-Xeon-E5-2650-v3.json} | 0 ...64-cpuid-Xeon-E5-2650.xml =3D> x86_64-cpuid-Xeon-E5-2650-v3.xml} | 0 ...890-disabled.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml} | 0 ...-8890-enabled.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml} | 0 ...n-E7-8890-guest.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3-guest.xml} | 0 ...eon-E7-8890-host.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3-host.xml} | 0 ...eon-E7-8890-json.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3-json.xml} | 0 ...-cpuid-Xeon-E7-8890.json =3D> x86_64-cpuid-Xeon-E7-8890-v3.json} | 0 ...64-cpuid-Xeon-E7-8890.xml =3D> x86_64-cpuid-Xeon-E7-8890-v3.xml} | 0 30 files changed, 5 insertions(+), 5 deletions(-) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-disabled.xml =3D> x86_= 64-cpuid-Xeon-E3-1245-v5-disabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-enabled.xml =3D> x86_6= 4-cpuid-Xeon-E3-1245-v5-enabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-guest.xml =3D> x86_64-= cpuid-Xeon-E3-1245-v5-guest.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-host.xml =3D> x86_64-c= puid-Xeon-E3-1245-v5-host.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-json.xml =3D> x86_64-c= puid-Xeon-E3-1245-v5-json.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245.json =3D> x86_64-cpuid= -Xeon-E3-1245-v5.json} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245.xml =3D> x86_64-cpuid-= Xeon-E3-1245-v5.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-disabled.xml =3D> x86_= 64-cpuid-Xeon-E5-2630-v3-disabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-enabled.xml =3D> x86_6= 4-cpuid-Xeon-E5-2630-v3-enabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-guest.xml =3D> x86_64-= cpuid-Xeon-E5-2630-v3-guest.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-host.xml =3D> x86_64-c= puid-Xeon-E5-2630-v3-host.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-json.xml =3D> x86_64-c= puid-Xeon-E5-2630-v3-json.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630.json =3D> x86_64-cpuid= -Xeon-E5-2630-v3.json} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630.xml =3D> x86_64-cpuid-= Xeon-E5-2630-v3.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-disabled.xml =3D> x86_= 64-cpuid-Xeon-E5-2650-v3-disabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-enabled.xml =3D> x86_6= 4-cpuid-Xeon-E5-2650-v3-enabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-guest.xml =3D> x86_64-= cpuid-Xeon-E5-2650-v3-guest.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-host.xml =3D> x86_64-c= puid-Xeon-E5-2650-v3-host.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-json.xml =3D> x86_64-c= puid-Xeon-E5-2650-v3-json.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650.json =3D> x86_64-cpuid= -Xeon-E5-2650-v3.json} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650.xml =3D> x86_64-cpuid-= Xeon-E5-2650-v3.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-disabled.xml =3D> x86_= 64-cpuid-Xeon-E7-8890-v3-disabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-enabled.xml =3D> x86_6= 4-cpuid-Xeon-E7-8890-v3-enabled.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-guest.xml =3D> x86_64-= cpuid-Xeon-E7-8890-v3-guest.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-host.xml =3D> x86_64-c= puid-Xeon-E7-8890-v3-host.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-json.xml =3D> x86_64-c= puid-Xeon-E7-8890-v3-json.xml} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890.json =3D> x86_64-cpuid= -Xeon-E7-8890-v3.json} (100%) rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890.xml =3D> x86_64-cpuid-= Xeon-E7-8890-v3.xml} (100%) diff --git a/tests/cputest.c b/tests/cputest.c index 170d16018..9c97f75a2 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1186,12 +1186,12 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245", JSON_MODELS); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630", JSON_HOST); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS_REQUIRED); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_MODELS); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE); diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh index 96ff1074e..3a2bfa049 100755 --- a/tests/cputestdata/cpu-parse.sh +++ b/tests/cputestdata/cpu-parse.sh @@ -16,7 +16,7 @@ fname=3D`sed -e 's/^ *//; s/ \(CPU\|Processor\)\>//; s/ @.*//; s/ APU .*//; - s/ \(v[0-9]\|SE\)$//; + s/ SE$//; s/ /-/g' <<<"$model"` fname=3D"x86_64-cpuid-$fname" =20 diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml b/tests/= cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E3-1245-v5.json similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.json diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml b/tests/cputes= tdata/x86_64-cpuid-Xeon-E3-1245-v5.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml b/tests/= cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E5-2630-v3.json similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.json diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml b/tests/cputes= tdata/x86_64-cpuid-Xeon-E5-2630-v3.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/= cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E5-2650-v3.json similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.json diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml b/tests/cputes= tdata/x86_64-cpuid-Xeon-E5-2650-v3.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml b/tests/= cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E7-8890-v3.json similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.json diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml b/tests/cputes= tdata/x86_64-cpuid-Xeon-E7-8890-v3.xml similarity index 100% rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.xml --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 13:34:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509652892965419.21458577118665; Thu, 2 Nov 2017 13:01:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8547EC04AC5B; Thu, 2 Nov 2017 20:01:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 583DA600C0; Thu, 2 Nov 2017 20:01:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F312A1800BCF; Thu, 2 Nov 2017 20:01:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA2JvrPI029141 for ; Thu, 2 Nov 2017 15:57:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBC845D97D; Thu, 2 Nov 2017 19:57:53 +0000 (UTC) Received: from mamuti.net (ovpn-204-160.brq.redhat.com [10.40.204.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AFEE5D97E for ; Thu, 2 Nov 2017 19:57:39 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 554EA103C77; Thu, 2 Nov 2017 20:57:38 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8547EC04AC5B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Thu, 2 Nov 2017 20:57:36 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] cputest: Add data for Intel(R) Xeon(R) CPU E5-2650 v4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 02 Nov 2017 20:01:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- tests/cputest.c | 1 + .../x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 6 + .../x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml | 9 + .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 30 ++ .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 34 ++ .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 11 + .../cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.json | 505 +++++++++++++++++= ++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.xml | 43 ++ 8 files changed, 639 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled= .xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.= xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.xml diff --git a/tests/cputest.c b/tests/cputest.c index 9c97f75a2..8a5316a88 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1189,6 +1189,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v4", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS_REQUIRED); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS); diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml b/= tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml new file mode 100644 index 000000000..aacc7a2b1 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml b/t= ests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml new file mode 100644 index 000000000..b11dd9b75 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml new file mode 100644 index 000000000..2fac54355 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml @@ -0,0 +1,30 @@ + + Skylake-Client + 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 new file mode 100644 index 000000000..f482864a9 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml @@ -0,0 +1,34 @@ + + x86_64 + Broadwell + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml new file mode 100644 index 000000000..5dfce947b --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml @@ -0,0 +1,11 @@ + + Skylake-Client + Intel + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.json b/tests/cp= utestdata/x86_64-cpuid-Xeon-E5-2650-v4.json new file mode 100644 index 000000000..798e0dff2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.json @@ -0,0 +1,505 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "pfthreshold": false, + "pku": false, + "rtm": true, + "tsc_adjust": true, + "tsc-deadline": true, + "xstore-en": false, + "cpuid-0xb": true, + "abm": true, + "ia64": false, + "kvm-mmu": false, + "xsaveopt": true, + "hv-spinlocks": -1, + "tce": false, + "realized": false, + "kvm_steal_time": true, + "smep": true, + "fpu": true, + "xcrypt": false, + "sse4_2": true, + "clflush": true, + "sse4_1": true, + "flushbyasid": false, + "kvm-steal-time": true, + "lm": true, + "tsc": true, + "adx": true, + "fxsr": true, + "sha-ni": false, + "decodeassists": false, + "hv-relaxed": false, + "pclmuldq": true, + "xgetbv1": false, + "xstore": false, + "vmcb_clean": false, + "tsc-adjust": true, + "vme": true, + "vendor": "GenuineIntel", + "arat": true, + "ffxsr": false, + "de": true, + "aes": true, + "pse": true, + "ds-cpl": false, + "fxsr_opt": false, + "tbm": false, + "sse": true, + "phe-en": false, + "f16c": true, + "ds": false, + "mpx": false, + "vmware-cpuid-freq": true, + "avx512f": false, + "avx2": true, + "level": 13, + "pbe": false, + "cx16": true, + "ds_cpl": false, + "movbe": true, + "perfctr-nb": false, + "nrip_save": false, + "kvm_mmu": false, + "ospke": false, + "pmu": false, + "avx512ifma": false, + "stepping": 1, + "sep": true, + "sse4a": false, + "avx512dq": false, + "core-id": -1, + "i64": true, + "avx512-4vnniw": false, + "xsave": true, + "pmm": false, + "hle": true, + "nodeid_msr": false, + "hv-crash": false, + "est": false, + "osxsave": false, + "xop": false, + "smx": false, + "tsc-scale": false, + "monitor": false, + "avx512er": false, + "apic": true, + "sse4.1": true, + "sse4.2": true, + "hv-vapic": false, + "pause-filter": false, + "lahf-lm": true, + "kvm-nopiodelay": true, + "cmp_legacy": false, + "acpi": false, + "fma4": false, + "mmx": true, + "svm_lock": false, + "pcommit": false, + "mtrr": true, + "clwb": false, + "dca": false, + "pdcm": false, + "xcrypt-en": false, + "3dnow": false, + "invtsc": false, + "tm2": false, + "hv-time": false, + "hypervisor": true, + "kvmclock-stable-bit": true, + "xlevel": 2147483656, + "lahf_lm": true, + "enforce": false, + "pcid": true, + "sse4-1": true, + "lbrv": false, + "avx512-vpopcntdq": false, + "avx512-4fmaps": false, + "fill-mtrr-mask": true, + "pause_filter": false, + "svm-lock": false, + "popcnt": true, + "nrip-save": false, + "avx512vl": false, + "x2apic": true, + "kvmclock": true, + "smap": true, + "pdpe1gb": true, + "family": 6, + "min-level": 13, + "xlevel2": 0, + "dtes64": false, + "xd": true, + "kvm_pv_eoi": true, + "ace2": false, + "kvm_pv_unhalt": true, + "xtpr": false, + "perfctr_nb": false, + "avx512bw": false, + "l3-cache": true, + "nx": true, + "lwp": false, + "msr": true, + "syscall": true, + "tm": false, + "perfctr-core": false, + "memory": "/machine/unattached/system[0]", + "pge": true, + "pn": false, + "fma": true, + "nodeid-msr": false, + "xsavec": false, + "socket-id": -1, + "thread-id": -1, + "cx8": true, + "mce": true, + "avx512cd": false, + "cr8legacy": false, + "mca": true, + "avx512pf": false, + "pni": true, + "hv-vendor-id": "", + "rdseed": true, + "osvw": false, + "fsgsbase": true, + "model-id": "Intel(R) Xeon(R) CPU E5-2650 v4 @ 2.20GHz", + "cmp-legacy": false, + "kvm-pv-unhalt": true, + "rdtscp": true, + "mmxext": false, + "host-phys-bits": true, + "cid": false, + "vmx": false, + "ssse3": true, + "extapic": false, + "pse36": true, + "min-xlevel": 2147483656, + "ibs": false, + "la57": false, + "avx": true, + "kvm-no-smi-migration": false, + "ace2-en": false, + "umip": false, + "invpcid": true, + "bmi1": true, + "bmi2": true, + "vmcb-clean": false, + "erms": true, + "cmov": true, + "check": true, + "perfctr_core": false, + "misalignsse": false, + "clflushopt": false, + "pat": true, + "sse4-2": true, + "3dnowprefetch": true, + "rdpid": false, + "full-cpuid-auto-level": true, + "pae": true, + "wdt": false, + "tsc_scale": false, + "skinit": false, + "fxsr-opt": false, + "kvm_nopiodelay": true, + "phys-bits": 0, + "kvm": true, + "pmm-en": false, + "phe": false, + "3dnowext": false, + "lmce": true, + "ht": false, + "tsc-frequency": 0, + "kvm-pv-eoi": true, + "npt": false, + "apic-id": 4294967295, + "kvm_asyncpf": true, + "min-xlevel2": 0, + "pclmulqdq": true, + "svm": false, + "sse3": true, + "sse2": true, + "ss": true, + "topoext": false, + "rdrand": true, + "avx512vbmi": false, + "kvm-asyncpf": true, + "xsaves": false, + "model": 79 + } + } + }, + "id": "model-expansion" +} + +{ + "return": [ + { + "typename": "max-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "max" + }, + { + "typename": "host-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "host" + }, + { + "typename": "base-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": true, + "name": "base" + }, + { + "typename": "qemu64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu64" + }, + { + "typename": "qemu32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu32" + }, + { + "typename": "phenom-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "fxsr-opt", + "3dnowext", + "3dnow", + "sse4a", + "npt" + ], + "migration-safe": true, + "static": false, + "name": "phenom" + }, + { + "typename": "pentium3-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium3" + }, + { + "typename": "pentium2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium2" + }, + { + "typename": "pentium-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium" + }, + { + "typename": "n270-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "n270" + }, + { + "typename": "kvm64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm64" + }, + { + "typename": "kvm32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm32" + }, + { + "typename": "cpu64-rhel6-x86_64-cpu", + "unavailable-features": [ + "sse4a" + ], + "migration-safe": true, + "static": false, + "name": "cpu64-rhel6" + }, + { + "typename": "coreduo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "coreduo" + }, + { + "typename": "core2duo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "core2duo" + }, + { + "typename": "athlon-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "3dnowext", + "3dnow" + ], + "migration-safe": true, + "static": false, + "name": "athlon" + }, + { + "typename": "Westmere-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Westmere" + }, + { + "typename": "Skylake-Client-x86_64-cpu", + "unavailable-features": [ + "mpx", + "xsavec", + "xgetbv1", + "mpx", + "mpx" + ], + "migration-safe": true, + "static": false, + "name": "Skylake-Client" + }, + { + "typename": "SandyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "SandyBridge" + }, + { + "typename": "Penryn-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Penryn" + }, + { + "typename": "Opteron_G5-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "xop", + "fma4", + "tbm" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G5" + }, + { + "typename": "Opteron_G4-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "xop", + "fma4" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G4" + }, + { + "typename": "Opteron_G3-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G3" + }, + { + "typename": "Opteron_G2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G2" + }, + { + "typename": "Opteron_G1-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G1" + }, + { + "typename": "Nehalem-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Nehalem" + }, + { + "typename": "IvyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "IvyBridge" + }, + { + "typename": "Haswell-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell" + }, + { + "typename": "Haswell-noTSX-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell-noTSX" + }, + { + "typename": "Conroe-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Conroe" + }, + { + "typename": "Broadwell-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Broadwell" + }, + { + "typename": "Broadwell-noTSX-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Broadwell-noTSX" + }, + { + "typename": "486-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "486" + } + ], + "id": "definitions" +} diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.xml b/tests/cpu= testdata/x86_64-cpuid-Xeon-E5-2650-v4.xml new file mode 100644 index 000000000..f995f7903 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 13:34:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509652888939134.13668161014948; Thu, 2 Nov 2017 13:01:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07BFD5D685; Thu, 2 Nov 2017 20:01:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A21432CFF3; Thu, 2 Nov 2017 20:01:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9EAA81800BCD; Thu, 2 Nov 2017 20:01:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA2Jvlrt029129 for ; Thu, 2 Nov 2017 15:57:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1ACCF5C7B7; Thu, 2 Nov 2017 19:57:47 +0000 (UTC) Received: from mamuti.net (ovpn-204-160.brq.redhat.com [10.40.204.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F13C620AB for ; Thu, 2 Nov 2017 19:57:39 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 589CE10BFC9; Thu, 2 Nov 2017 20:57:38 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 07BFD5D685 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Thu, 2 Nov 2017 20:57:37 +0100 Message-Id: <25c71ba3cebb516e2691eca145e98f914effb68b.1509652558.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] cputest: Add data for Intel(R) Core(TM) i7-7700 CPU X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 02 Nov 2017 20:01:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- tests/cputest.c | 1 + .../x86_64-cpuid-Core-i7-7700-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-7700-enabled.xml | 9 + .../x86_64-cpuid-Core-i7-7700-guest.xml | 25 ++ .../cputestdata/x86_64-cpuid-Core-i7-7700-host.xml | 26 ++ .../cputestdata/x86_64-cpuid-Core-i7-7700-json.xml | 9 + tests/cputestdata/x86_64-cpuid-Core-i7-7700.json | 499 +++++++++++++++++= ++++ tests/cputestdata/x86_64-cpuid-Core-i7-7700.xml | 47 ++ 8 files changed, 622 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700.xml diff --git a/tests/cputest.c b/tests/cputest.c index 8a5316a88..a90ce01d1 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1174,6 +1174,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-4510U", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-arat", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7700", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7601-32-Core", JSON_HOST); diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml new file mode 100644 index 000000000..fcdcc97e0 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml new file mode 100644 index 000000000..9096a633a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/= cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml new file mode 100644 index 000000000..c3561d597 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml @@ -0,0 +1,25 @@ + + Skylake-Client + 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 new file mode 100644 index 000000000..c799394ea --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml @@ -0,0 +1,26 @@ + + x86_64 + Skylake-Client + Intel + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml b/tests/c= putestdata/x86_64-cpuid-Core-i7-7700-json.xml new file mode 100644 index 000000000..12424bc67 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml @@ -0,0 +1,9 @@ + + Skylake-Client + Intel + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700.json b/tests/cpute= stdata/x86_64-cpuid-Core-i7-7700.json new file mode 100644 index 000000000..5946a64c9 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700.json @@ -0,0 +1,499 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "pfthreshold": false, + "pku": false, + "rtm": true, + "tsc_adjust": true, + "tsc-deadline": true, + "xstore-en": false, + "cpuid-0xb": true, + "abm": true, + "ia64": false, + "kvm-mmu": false, + "xsaveopt": true, + "hv-spinlocks": -1, + "tce": false, + "realized": false, + "kvm_steal_time": true, + "smep": true, + "fpu": true, + "xcrypt": false, + "sse4_2": true, + "clflush": true, + "sse4_1": true, + "flushbyasid": false, + "kvm-steal-time": true, + "lm": true, + "tsc": true, + "adx": true, + "fxsr": true, + "sha-ni": false, + "decodeassists": false, + "hv-relaxed": false, + "pclmuldq": true, + "xgetbv1": true, + "xstore": false, + "vmcb_clean": false, + "tsc-adjust": true, + "vme": true, + "vendor": "GenuineIntel", + "arat": true, + "ffxsr": false, + "de": true, + "aes": true, + "pse": true, + "ds-cpl": false, + "fxsr_opt": false, + "tbm": false, + "sse": true, + "phe-en": false, + "f16c": true, + "ds": false, + "mpx": true, + "vmware-cpuid-freq": true, + "avx512f": false, + "avx2": true, + "level": 13, + "pbe": false, + "cx16": true, + "ds_cpl": false, + "movbe": true, + "perfctr-nb": false, + "nrip_save": false, + "kvm_mmu": false, + "ospke": false, + "pmu": false, + "avx512ifma": false, + "stepping": 9, + "sep": true, + "sse4a": false, + "avx512dq": false, + "core-id": -1, + "i64": true, + "avx512-4vnniw": false, + "xsave": true, + "pmm": false, + "hle": true, + "nodeid_msr": false, + "hv-crash": false, + "est": false, + "osxsave": false, + "xop": false, + "smx": false, + "tsc-scale": false, + "monitor": false, + "avx512er": false, + "apic": true, + "sse4.1": true, + "sse4.2": true, + "hv-vapic": false, + "pause-filter": false, + "lahf-lm": true, + "kvm-nopiodelay": true, + "cmp_legacy": false, + "acpi": false, + "fma4": false, + "mmx": true, + "svm_lock": false, + "pcommit": false, + "mtrr": true, + "clwb": false, + "dca": false, + "pdcm": false, + "xcrypt-en": false, + "3dnow": false, + "invtsc": false, + "tm2": false, + "hv-time": false, + "hypervisor": true, + "kvmclock-stable-bit": true, + "xlevel": 2147483656, + "lahf_lm": true, + "enforce": false, + "pcid": true, + "sse4-1": true, + "lbrv": false, + "avx512-vpopcntdq": false, + "avx512-4fmaps": false, + "fill-mtrr-mask": true, + "pause_filter": false, + "svm-lock": false, + "popcnt": true, + "nrip-save": false, + "avx512vl": false, + "x2apic": true, + "kvmclock": true, + "smap": true, + "pdpe1gb": true, + "family": 6, + "min-level": 13, + "xlevel2": 0, + "dtes64": false, + "xd": true, + "kvm_pv_eoi": true, + "ace2": false, + "kvm_pv_unhalt": true, + "xtpr": false, + "perfctr_nb": false, + "avx512bw": false, + "l3-cache": true, + "nx": true, + "lwp": false, + "msr": true, + "syscall": true, + "tm": false, + "perfctr-core": false, + "memory": "/machine/unattached/system[0]", + "pge": true, + "pn": false, + "fma": true, + "nodeid-msr": false, + "xsavec": true, + "socket-id": -1, + "thread-id": -1, + "cx8": true, + "mce": true, + "avx512cd": false, + "cr8legacy": false, + "mca": true, + "avx512pf": false, + "pni": true, + "hv-vendor-id": "", + "rdseed": true, + "osvw": false, + "fsgsbase": true, + "model-id": "Intel(R) Core(TM) i7-7700 CPU @ 3.60GHz", + "cmp-legacy": false, + "kvm-pv-unhalt": true, + "rdtscp": true, + "mmxext": false, + "host-phys-bits": true, + "cid": false, + "vmx": false, + "ssse3": true, + "extapic": false, + "pse36": true, + "min-xlevel": 2147483656, + "ibs": false, + "la57": false, + "avx": true, + "kvm-no-smi-migration": false, + "ace2-en": false, + "umip": false, + "invpcid": true, + "bmi1": true, + "bmi2": true, + "vmcb-clean": false, + "erms": true, + "cmov": true, + "check": true, + "perfctr_core": false, + "misalignsse": false, + "clflushopt": true, + "pat": true, + "sse4-2": true, + "3dnowprefetch": true, + "rdpid": false, + "full-cpuid-auto-level": true, + "pae": true, + "wdt": false, + "tsc_scale": false, + "skinit": false, + "fxsr-opt": false, + "kvm_nopiodelay": true, + "phys-bits": 0, + "kvm": true, + "pmm-en": false, + "phe": false, + "3dnowext": false, + "lmce": true, + "ht": false, + "tsc-frequency": 0, + "kvm-pv-eoi": true, + "npt": false, + "apic-id": 4294967295, + "kvm_asyncpf": true, + "min-xlevel2": 0, + "pclmulqdq": true, + "svm": false, + "sse3": true, + "sse2": true, + "ss": true, + "topoext": false, + "rdrand": true, + "avx512vbmi": false, + "kvm-asyncpf": true, + "xsaves": false, + "model": 158 + } + } + }, + "id": "model-expansion" +} + +{ + "return": [ + { + "typename": "max-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "max" + }, + { + "typename": "host-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "host" + }, + { + "typename": "base-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": true, + "name": "base" + }, + { + "typename": "qemu64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu64" + }, + { + "typename": "qemu32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu32" + }, + { + "typename": "phenom-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "fxsr-opt", + "3dnowext", + "3dnow", + "sse4a", + "npt" + ], + "migration-safe": true, + "static": false, + "name": "phenom" + }, + { + "typename": "pentium3-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium3" + }, + { + "typename": "pentium2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium2" + }, + { + "typename": "pentium-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium" + }, + { + "typename": "n270-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "n270" + }, + { + "typename": "kvm64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm64" + }, + { + "typename": "kvm32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm32" + }, + { + "typename": "cpu64-rhel6-x86_64-cpu", + "unavailable-features": [ + "sse4a" + ], + "migration-safe": true, + "static": false, + "name": "cpu64-rhel6" + }, + { + "typename": "coreduo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "coreduo" + }, + { + "typename": "core2duo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "core2duo" + }, + { + "typename": "athlon-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "3dnowext", + "3dnow" + ], + "migration-safe": true, + "static": false, + "name": "athlon" + }, + { + "typename": "Westmere-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Westmere" + }, + { + "typename": "Skylake-Client-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Skylake-Client" + }, + { + "typename": "SandyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "SandyBridge" + }, + { + "typename": "Penryn-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Penryn" + }, + { + "typename": "Opteron_G5-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "xop", + "fma4", + "tbm" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G5" + }, + { + "typename": "Opteron_G4-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "xop", + "fma4" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G4" + }, + { + "typename": "Opteron_G3-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G3" + }, + { + "typename": "Opteron_G2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G2" + }, + { + "typename": "Opteron_G1-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G1" + }, + { + "typename": "Nehalem-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Nehalem" + }, + { + "typename": "IvyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "IvyBridge" + }, + { + "typename": "Haswell-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell" + }, + { + "typename": "Haswell-noTSX-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell-noTSX" + }, + { + "typename": "Conroe-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Conroe" + }, + { + "typename": "Broadwell-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Broadwell" + }, + { + "typename": "Broadwell-noTSX-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Broadwell-noTSX" + }, + { + "typename": "486-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "486" + } + ], + "id": "definitions" +} diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700.xml b/tests/cputes= tdata/x86_64-cpuid-Core-i7-7700.xml new file mode 100644 index 000000000..23cdaae68 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list