From nobody Sat Feb  7 09:59:13 2026
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;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 15344214689171023.5986188818812;
 Thu, 16 Aug 2018 05:11:08 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id C197F30B8F8B;
	Thu, 16 Aug 2018 12:11:05 +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 6D6D753B24;
	Thu, 16 Aug 2018 12:11: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 CC3AA1841C4A;
	Thu, 16 Aug 2018 12:11:04 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w7GCAh0p026305 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 16 Aug 2018 08:10:43 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id A1A202166BB1; Thu, 16 Aug 2018 12:10:43 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-117-135.ams2.redhat.com
	[10.36.117.135])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8A4362166BA0;
	Thu, 16 Aug 2018 12:10:42 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu, 16 Aug 2018 13:10:30 +0100
Message-Id: <20180816121031.10902-8-berrange@redhat.com>
In-Reply-To: <20180816121031.10902-1-berrange@redhat.com>
References: <20180816121031.10902-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 7/8] cpu: split x86 map data into separate files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Thu, 16 Aug 2018 12:11:07 +0000 (UTC)
X-ZohoMail: RDMRC_0  RSF_0  Z_629925259 SPT_0

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 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 =3D \
 	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)
=20
 EXTRA_DIST +=3D $(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=3D'x86'>
-    <!-- vendor definitions -->
-    <vendor name=3D'Intel' string=3D'GenuineIntel'/>
-    <vendor name=3D'AMD' string=3D'AuthenticAMD'/>
-
-    <!-- standard features, EDX -->
-    <feature name=3D'fpu'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000001'/>
-    </feature>
-    <feature name=3D'vme'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'de'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000004'/>
-    </feature>
-    <feature name=3D'pse'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'tsc'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000010'/>
-    </feature>
-    <feature name=3D'msr'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000020'/>
-    </feature>
-    <feature name=3D'pae'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000040'/>
-    </feature>
-    <feature name=3D'mce'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000080'/>
-    </feature>
-    <feature name=3D'cx8'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000100'/>
-    </feature>
-    <feature name=3D'apic'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000200'/>
-    </feature>
-    <feature name=3D'sep'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00000800'/>
-    </feature>
-    <feature name=3D'mtrr'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00001000'/>
-    </feature>
-    <feature name=3D'pge'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00002000'/>
-    </feature>
-    <feature name=3D'mca'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00004000'/>
-    </feature>
-    <feature name=3D'cmov'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00008000'/>
-    </feature>
-    <feature name=3D'pat'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00010000'/>
-    </feature>
-    <feature name=3D'pse36'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00020000'/>
-    </feature>
-    <feature name=3D'pn'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00040000'/>
-    </feature>
-    <feature name=3D'clflush'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00080000'/>
-    </feature>
-    <feature name=3D'ds'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00200000'/>
-    </feature>
-    <feature name=3D'acpi'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00400000'/>
-    </feature>
-    <feature name=3D'mmx'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x00800000'/>
-    </feature>
-    <feature name=3D'fxsr'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x01000000'/>
-    </feature>
-    <feature name=3D'sse'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x02000000'/>
-    </feature>
-    <feature name=3D'sse2'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x04000000'/>
-    </feature>
-    <feature name=3D'ss'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x08000000'/>
-    </feature>
-    <feature name=3D'ht'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x10000000'/>
-    </feature>
-    <feature name=3D'tm'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x20000000'/>
-    </feature>
-    <feature name=3D'ia64'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x40000000'/>
-    </feature>
-    <feature name=3D'pbe'>
-      <cpuid eax_in=3D'0x01' edx=3D'0x80000000'/>
-    </feature>
-
-    <!-- standard features, ECX -->
-    <feature name=3D'pni'> <!-- sse3 -->
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000001'/>
-    </feature>
-    <feature name=3D'pclmuldq'> <!-- pclmulqdq -->
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'dtes64'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000004'/>
-    </feature>
-    <feature name=3D'monitor'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'ds_cpl'> <!-- ds-cpl -->
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000010'/>
-    </feature>
-    <feature name=3D'vmx'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000020'/>
-    </feature>
-     <feature name=3D'smx'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000040'/>
-    </feature>
-    <feature name=3D'est'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000080'/>
-    </feature>
-    <feature name=3D'tm2'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000100'/>
-    </feature>
-    <feature name=3D'ssse3'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000200'/>
-    </feature>
-    <feature name=3D'cid'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00000400'/>
-    </feature>
-    <feature name=3D'fma'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00001000'/>
-    </feature>
-    <feature name=3D'cx16'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00002000'/>
-    </feature>
-    <feature name=3D'xtpr'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00004000'/>
-    </feature>
-    <feature name=3D'pdcm'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00008000'/>
-    </feature>
-    <feature name=3D'pcid'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00020000'/>
-    </feature>
-    <feature name=3D'dca'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00040000'/>
-    </feature>
-    <feature name=3D'sse4.1'> <!-- sse4-1, sse4_1 -->
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00080000'/>
-    </feature>
-    <feature name=3D'sse4.2'> <!-- sse4-2, sse4_2 -->
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00100000'/>
-    </feature>
-    <feature name=3D'x2apic'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00200000'/>
-    </feature>
-    <feature name=3D'movbe'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00400000'/>
-    </feature>
-    <feature name=3D'popcnt'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x00800000'/>
-    </feature>
-    <feature name=3D'tsc-deadline'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x01000000'/>
-    </feature>
-    <feature name=3D'aes'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x02000000'/>
-    </feature>
-    <feature name=3D'xsave'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x04000000'/>
-    </feature>
-    <feature name=3D'osxsave'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x08000000'/>
-    </feature>
-    <feature name=3D'avx'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x10000000'/>
-    </feature>
-    <feature name=3D'f16c'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x20000000'/>
-    </feature>
-    <feature name=3D'rdrand'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x40000000'/>
-    </feature>
-    <feature name=3D'hypervisor'>
-      <cpuid eax_in=3D'0x01' ecx=3D'0x80000000'/>
-    </feature>
-
-    <!-- Termal Power and Management -->
-    <feature name=3D'arat'>
-      <cpuid eax_in=3D'0x06' eax=3D'0x00000004'/>
-    </feature>
-
-    <!-- cpuid function 0x7 ecx 0x0 features -->
-    <feature name=3D'fsgsbase'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000001'/>
-    </feature>
-    <feature name=3D'tsc_adjust'> <!-- tsc-adjust -->
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'bmi1'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'hle'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000010'/>
-    </feature>
-    <feature name=3D'avx2'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000020'/>
-    </feature>
-    <feature name=3D'smep'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000080'/>
-    </feature>
-    <feature name=3D'bmi2'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000100'/>
-    </feature>
-    <feature name=3D'erms'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000200'/>
-    </feature>
-    <feature name=3D'invpcid'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000400'/>
-    </feature>
-    <feature name=3D'rtm'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000800'/>
-    </feature>
-    <feature name=3D'cmt'> <!-- cqm -->
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00001000'/>
-    </feature>
-    <feature name=3D'mpx'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00004000'/>
-    </feature>
-    <feature name=3D'avx512f'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00010000'/>
-    </feature>
-    <feature name=3D'avx512dq'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00020000'/>
-    </feature>
-    <feature name=3D'rdseed'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00040000'/>
-    </feature>
-    <feature name=3D'adx'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00080000'/>
-    </feature>
-    <feature name=3D'smap'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00100000'/>
-    </feature>
-    <feature name=3D'avx512ifma'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00200000'/>
-    </feature>
-    <feature name=3D'pcommit'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00400000'/>
-    </feature>
-    <feature name=3D'clflushopt'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00800000'/>
-    </feature>
-    <feature name=3D'clwb'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x01000000'/>
-    </feature>
-    <feature name=3D'avx512pf'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x04000000'/>
-    </feature>
-    <feature name=3D'avx512er'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x08000000'/>
-    </feature>
-    <feature name=3D'avx512cd'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x10000000'/>
-    </feature>
-    <feature name=3D'sha-ni'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x20000000'/>
-    </feature>
-    <feature name=3D'avx512bw'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x40000000'/>
-    </feature>
-    <feature name=3D'avx512vl'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x80000000'/>
-    </feature>
-
-    <feature name=3D'avx512vbmi'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'pku'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'ospke'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000010'/>
-    </feature>
-    <feature name=3D'la57'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00010000'/>
-    </feature>
-
-    <feature name=3D'avx512-4vnniw'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000004'/>
-    </feature>
-    <feature name=3D'avx512-4fmaps'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'spec-ctrl'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x04000000'/>
-    </feature>
-    <feature name=3D'ssbd'>
-      <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x80000000'/>
-    </feature>
-
-    <!-- Processor Extended State Enumeration sub leaf 1 -->
-    <feature name=3D'xsaveopt'>
-      <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000001'/>
-    </feature>
-    <feature name=3D'xsavec'>
-      <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'xgetbv1'>
-      <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000004'/>
-    </feature>
-    <feature name=3D'xsaves' migratable=3D'no'>
-      <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000008'/>
-    </feature>
-
-    <!-- cpuid level 0x0000000f:1 (edx) -->
-    <feature name=3D'mbm_total'>
-      <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'mbm_local'>
-      <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000004'/>
-    </feature>
-
-    <!-- extended features, EDX -->
-    <feature name=3D'syscall'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x00000800'/>
-    </feature>
-    <feature name=3D'nx'> <!-- xd -->
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x00100000'/>
-    </feature>
-    <feature name=3D'mmxext'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x00400000'/>
-    </feature>
-    <feature name=3D'fxsr_opt'> <!-- ffxsr, fxsr-opt -->
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x02000000'/>
-    </feature>
-    <feature name=3D'pdpe1gb'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x04000000'/>
-    </feature>
-    <feature name=3D'rdtscp'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x08000000'/>
-    </feature>
-    <feature name=3D'lm'> <!-- i64 -->
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x20000000'/>
-    </feature>
-    <feature name=3D'3dnowext'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x40000000'/>
-    </feature>
-    <feature name=3D'3dnow'>
-      <cpuid eax_in=3D'0x80000001' edx=3D'0x80000000'/>
-    </feature>
-
-    <!-- extended features, ECX -->
-    <feature name=3D'lahf_lm'> <!-- lahf-lm -->
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000001'/>
-    </feature>
-    <feature name=3D'cmp_legacy'> <!-- cmp-legacy -->
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000002'/>
-    </feature>
-    <feature name=3D'svm'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000004'/>
-    </feature>
-    <feature name=3D'extapic'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000008'/>
-    </feature>
-    <feature name=3D'cr8legacy'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000010'/>
-    </feature>
-    <feature name=3D'abm'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000020'/>
-    </feature>
-    <feature name=3D'sse4a'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000040'/>
-    </feature>
-    <feature name=3D'misalignsse'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000080'/>
-    </feature>
-    <feature name=3D'3dnowprefetch'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000100'/>
-    </feature>
-    <feature name=3D'osvw'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000200'/>
-    </feature>
-    <feature name=3D'ibs'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000400'/>
-    </feature>
-    <feature name=3D'xop'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000800'/>
-    </feature>
-    <feature name=3D'skinit'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00001000'/>
-    </feature>
-    <feature name=3D'wdt'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00002000'/>
-    </feature>
-    <feature name=3D'lwp'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00008000'/>
-    </feature>
-    <feature name=3D'fma4'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00010000'/>
-    </feature>
-    <feature name=3D'tce'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00020000'/>
-    </feature>
-    <feature name=3D'cvt16'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00040000'/>
-    </feature>
-    <feature name=3D'nodeid_msr'> <!-- nodeid-msr -->
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00080000'/>
-    </feature>
-    <feature name=3D'tbm'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00200000'/>
-    </feature>
-    <feature name=3D'topoext'>
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00400000'/>
-    </feature>
-    <feature name=3D'perfctr_core'> <!-- perfctr-core -->
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x00800000'/>
-    </feature>
-    <feature name=3D'perfctr_nb'> <!-- perfctr-nb -->
-      <cpuid eax_in=3D'0x80000001' ecx=3D'0x01000000'/>
-    </feature>
-
-    <!-- Advanced Power Management edx features -->
-    <feature name=3D'invtsc' migratable=3D'no'>
-      <cpuid eax_in=3D'0x80000007' edx=3D'0x00000100'/>
-    </feature>
-
-    <!-- More AMD-specific features -->
-    <feature name=3D'ibpb'>
-      <cpuid eax_in=3D'0x80000008' ebx=3D'0x00001000'/>
-    </feature>
-    <feature name=3D'amd-ssbd'>
-      <cpuid eax_in=3D'0x80000008' ebx=3D'0x01000000'/>
-    </feature>
-    <feature name=3D'virt-ssbd'>
-      <cpuid eax_in=3D'0x80000008' ebx=3D'0x02000000'/>
-    </feature>
-    <feature name=3D'amd-no-ssb'>
-      <cpuid eax_in=3D'0x80000008' ebx=3D'0x04000000'/>
-    </feature>
+    <include filename=3D"x86_vendors.xml"/>
+    <include filename=3D"x86_features.xml"/>
=20
     <!-- models -->
-    <model name=3D'486'>
-      <feature name=3D'fpu'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'vme'/>
-    </model>
+    <include filename=3D"x86_486.xml"/>
=20
     <!-- Intel-based QEMU generic CPU models -->
-    <model name=3D'pentium'>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'pentium2'>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'pentium3'>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'pentiumpro'>
-      <feature name=3D'apic'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'coreduo'>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'n270'>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'core2duo'>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
+    <include filename=3D"x86_pentium.xml"/>
+    <include filename=3D"x86_pentium2.xml"/>
+    <include filename=3D"x86_pentium3.xml"/>
+    <include filename=3D"x86_pentiumpro.xml"/>
+    <include filename=3D"x86_coreduo.xml"/>
+    <include filename=3D"x86_n270.xml"/>
+    <include filename=3D"x86_core2duo.xml"/>
=20
     <!-- Generic QEMU CPU models -->
-    <model name=3D'qemu32'>
-      <feature name=3D'apic'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'kvm32'>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'cpu64-rhel5'>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'cpu64-rhel6'>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'kvm64'>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'qemu64'>
-      <!-- These are supported only by TCG.  KVM supports them only if the
-           host does.  So we leave them out:
-
-           <feature name=3D'abm'/>
-           <feature name=3D'lahf_lm'/>
-           <feature name=3D'popcnt'/>
-           <feature name=3D'sse4a'/>
-      -->
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
+    <include filename=3D"x86_qemu32.xml"/>
+    <include filename=3D"x86_kvm32.xml"/>
+    <include filename=3D"x86_cpu64-rhel5.xml"/>
+    <include filename=3D"x86_cpu64-rhel6.xml"/>
+    <include filename=3D"x86_qemu64.xml"/>
+    <include filename=3D"x86_kvm64.xml"/>
=20
     <!-- Intel CPU models -->
-    <model name=3D'Conroe'>
-      <signature family=3D'6' model=3D'15'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Penryn'>
-      <signature family=3D'6' model=3D'23'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Nehalem'>
-      <signature family=3D'6' model=3D'26'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Nehalem-IBRS'>
-      <signature family=3D'6' model=3D'26'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Westmere'>
-      <signature family=3D'6' model=3D'44'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Westmere-IBRS'>
-      <signature family=3D'6' model=3D'44'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'SandyBridge'>
-      <signature family=3D'6' model=3D'42'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'SandyBridge-IBRS'>
-      <signature family=3D'6' model=3D'42'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'IvyBridge'>
-      <signature family=3D'6' model=3D'58'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'IvyBridge-IBRS'>
-      <signature family=3D'6' model=3D'58'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Haswell-noTSX'>
-      <signature family=3D'6' model=3D'60'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Haswell-noTSX-IBRS'>
-      <signature family=3D'6' model=3D'60'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Haswell'>
-      <signature family=3D'6' model=3D'60'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Haswell-IBRS'>
-      <signature family=3D'6' model=3D'60'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Broadwell-noTSX'>
-      <signature family=3D'6' model=3D'61'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Broadwell-noTSX-IBRS'>
-      <signature family=3D'6' model=3D'61'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Broadwell'>
-      <signature family=3D'6' model=3D'61'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Broadwell-IBRS'>
-      <signature family=3D'6' model=3D'61'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Skylake-Client'>
-      <signature family=3D'6' model=3D'94'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'mpx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
-
-    <model name=3D'Skylake-Client-IBRS'>
-      <signature family=3D'6' model=3D'94'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'mpx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
-
-    <model name=3D'Skylake-Server'>
-      <signature family=3D'6' model=3D'85'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'avx512bw'/>
-      <feature name=3D'avx512cd'/>
-      <feature name=3D'avx512dq'/>
-      <feature name=3D'avx512f'/>
-      <feature name=3D'avx512vl'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'clwb'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'mpx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
-
-    <model name=3D'Skylake-Server-IBRS'>
-      <signature family=3D'6' model=3D'85'/>
-      <vendor name=3D'Intel'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'avx512bw'/>
-      <feature name=3D'avx512cd'/>
-      <feature name=3D'avx512dq'/>
-      <feature name=3D'avx512f'/>
-      <feature name=3D'avx512vl'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'clwb'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'erms'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'hle'/>
-      <feature name=3D'invpcid'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'mpx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pcid'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'rtm'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'spec-ctrl'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'tsc-deadline'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'x2apic'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
+    <include filename=3D"x86_Conroe.xml"/>
+    <include filename=3D"x86_Penryn.xml"/>
+    <include filename=3D"x86_Nehalem.xml"/>
+    <include filename=3D"x86_Nehalem-IBRS.xml"/>
+    <include filename=3D"x86_Westmere.xml"/>
+    <include filename=3D"x86_Westmere-IBRS.xml"/>
+    <include filename=3D"x86_SandyBridge.xml"/>
+    <include filename=3D"x86_SandyBridge-IBRS.xml"/>
+    <include filename=3D"x86_IvyBridge.xml"/>
+    <include filename=3D"x86_IvyBridge-IBRS.xml"/>
+    <include filename=3D"x86_Haswell-noTSX.xml"/>
+    <include filename=3D"x86_Haswell-noTSX-IBRS.xml"/>
+    <include filename=3D"x86_Haswell.xml"/>
+    <include filename=3D"x86_Haswell-IBRS.xml"/>
+    <include filename=3D"x86_Broadwell-noTSX.xml"/>
+    <include filename=3D"x86_Broadwell-noTSX-IBRS.xml"/>
+    <include filename=3D"x86_Broadwell.xml"/>
+    <include filename=3D"x86_Broadwell-IBRS.xml"/>
+    <include filename=3D"x86_Skylake-Client.xml"/>
+    <include filename=3D"x86_Skylake-Client-IBRS.xml"/>
+    <include filename=3D"x86_Skylake-Server.xml"/>
+    <include filename=3D"x86_Skylake-Server-IBRS.xml"/>
=20
     <!-- AMD CPUs -->
-    <model name=3D'athlon'>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnow'/>
-      <feature name=3D'3dnowext'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'mmxext'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-    </model>
-
-    <model name=3D'phenom'>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnow'/>
-      <feature name=3D'3dnowext'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'fxsr_opt'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'mmxext'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Opteron_G1'>
-      <signature family=3D'15' model=3D'6'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Opteron_G2'>
-      <signature family=3D'15' model=3D'6'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Opteron_G3'>
-      <signature family=3D'15' model=3D'6'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'misalignsse'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4a'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-    </model>
-
-    <model name=3D'Opteron_G4'>
-      <signature family=3D'21' model=3D'1'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'fma4'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'misalignsse'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'sse4a'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'xop'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'Opteron_G5'>
-      <signature family=3D'21' model=3D'2'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fma4'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'misalignsse'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'sse4a'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tbm'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'xop'/>
-      <feature name=3D'xsave'/>
-    </model>
-
-    <model name=3D'EPYC'>
-      <signature family=3D'23' model=3D'1'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'clflushopt'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cr8legacy'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'fxsr_opt'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'misalignsse'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'mmxext'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'osvw'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sha-ni'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'sse4a'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
-
-    <model name=3D'EPYC-IBPB'>
-      <signature family=3D'23' model=3D'1'/>
-      <vendor name=3D'AMD'/>
-      <feature name=3D'3dnowprefetch'/>
-      <feature name=3D'abm'/>
-      <feature name=3D'adx'/>
-      <feature name=3D'aes'/>
-      <feature name=3D'apic'/>
-      <feature name=3D'arat'/>
-      <feature name=3D'avx'/>
-      <feature name=3D'avx2'/>
-      <feature name=3D'bmi1'/>
-      <feature name=3D'bmi2'/>
-      <feature name=3D'clflush'/>
-      <feature name=3D'clflushopt'/>
-      <feature name=3D'cmov'/>
-      <feature name=3D'cr8legacy'/>
-      <feature name=3D'cx16'/>
-      <feature name=3D'cx8'/>
-      <feature name=3D'de'/>
-      <feature name=3D'f16c'/>
-      <feature name=3D'fma'/>
-      <feature name=3D'fpu'/>
-      <feature name=3D'fsgsbase'/>
-      <feature name=3D'fxsr'/>
-      <feature name=3D'fxsr_opt'/>
-      <feature name=3D'ibpb'/>
-      <feature name=3D'lahf_lm'/>
-      <feature name=3D'lm'/>
-      <feature name=3D'mca'/>
-      <feature name=3D'mce'/>
-      <feature name=3D'misalignsse'/>
-      <feature name=3D'mmx'/>
-      <feature name=3D'mmxext'/>
-      <feature name=3D'monitor'/>
-      <feature name=3D'movbe'/>
-      <feature name=3D'msr'/>
-      <feature name=3D'mtrr'/>
-      <feature name=3D'nx'/>
-      <feature name=3D'osvw'/>
-      <feature name=3D'pae'/>
-      <feature name=3D'pat'/>
-      <feature name=3D'pclmuldq'/>
-      <feature name=3D'pdpe1gb'/>
-      <feature name=3D'pge'/>
-      <feature name=3D'pni'/>
-      <feature name=3D'popcnt'/>
-      <feature name=3D'pse'/>
-      <feature name=3D'pse36'/>
-      <feature name=3D'rdrand'/>
-      <feature name=3D'rdseed'/>
-      <feature name=3D'rdtscp'/>
-      <feature name=3D'sep'/>
-      <feature name=3D'sha-ni'/>
-      <feature name=3D'smap'/>
-      <feature name=3D'smep'/>
-      <feature name=3D'sse'/>
-      <feature name=3D'sse2'/>
-      <feature name=3D'sse4.1'/>
-      <feature name=3D'sse4.2'/>
-      <feature name=3D'sse4a'/>
-      <feature name=3D'ssse3'/>
-      <feature name=3D'svm'/>
-      <feature name=3D'syscall'/>
-      <feature name=3D'tsc'/>
-      <feature name=3D'vme'/>
-      <feature name=3D'xgetbv1'/>
-      <feature name=3D'xsave'/>
-      <feature name=3D'xsavec'/>
-      <feature name=3D'xsaveopt'/>
-    </model>
+    <include filename=3D"x86_athlon.xml"/>
+    <include filename=3D"x86_phenom.xml"/>
+    <include filename=3D"x86_Opteron_G1.xml"/>
+    <include filename=3D"x86_Opteron_G2.xml"/>
+    <include filename=3D"x86_Opteron_G3.xml"/>
+    <include filename=3D"x86_Opteron_G4.xml"/>
+    <include filename=3D"x86_Opteron_G5.xml"/>
+    <include filename=3D"x86_EPYC.xml"/>
+    <include filename=3D"x86_EPYC-IBRS.xml"/>
   </arch>
=20
   <arch name=3D'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=3D'486'>
+    <feature name=3D'fpu'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'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=3D'Broadwell-IBRS'>
+    <signature family=3D'6' model=3D'61'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Bro=
adwell-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=3D'Broadwell-noTSX-IBRS'>
+    <signature family=3D'6' model=3D'61'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwel=
l-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=3D'Broadwell-noTSX'>
+    <signature family=3D'6' model=3D'61'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'Broadwell'>
+    <signature family=3D'6' model=3D'61'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'Conroe'>
+    <signature family=3D'6' model=3D'15'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'EPYC-IBPB'>
+    <signature family=3D'23' model=3D'1'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'clflushopt'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cr8legacy'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'fxsr_opt'/>
+    <feature name=3D'ibpb'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'misalignsse'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'mmxext'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'osvw'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sha-ni'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'sse4a'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'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=3D'EPYC'>
+    <signature family=3D'23' model=3D'1'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'clflushopt'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cr8legacy'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'fxsr_opt'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'misalignsse'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'mmxext'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'osvw'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sha-ni'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'sse4a'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBR=
S.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=3D'Haswell-IBRS'>
+    <signature family=3D'6' model=3D'60'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswe=
ll-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=3D'Haswell-noTSX-IBRS'>
+    <signature family=3D'6' model=3D'60'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-no=
TSX.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=3D'Haswell-noTSX'>
+    <signature family=3D'6' model=3D'60'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'Haswell'>
+    <signature family=3D'6' model=3D'60'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'IvyBridge-IBRS'>
+    <signature family=3D'6' model=3D'58'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'IvyBridge'>
+    <signature family=3D'6' model=3D'58'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBR=
S.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=3D'Nehalem-IBRS'>
+    <signature family=3D'6' model=3D'26'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Nehalem'>
+    <signature family=3D'6' model=3D'26'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Opteron_G1'>
+    <signature family=3D'15' model=3D'6'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Opteron_G2'>
+    <signature family=3D'15' model=3D'6'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Opteron_G3'>
+    <signature family=3D'15' model=3D'6'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'misalignsse'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4a'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Opteron_G4'>
+    <signature family=3D'21' model=3D'1'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fma4'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'misalignsse'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'sse4a'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'xop'/>
+    <feature name=3D'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=3D'Opteron_G5'>
+    <signature family=3D'21' model=3D'2'/>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fma4'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'misalignsse'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'sse4a'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tbm'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'xop'/>
+    <feature name=3D'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=3D'Penryn'>
+    <signature family=3D'6' model=3D'23'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBr=
idge-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=3D'SandyBridge-IBRS'>
+    <signature family=3D'6' model=3D'42'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'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=3D'SandyBridge'>
+    <signature family=3D'6' model=3D'42'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xsave'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-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=3D'Skylake-Client-IBRS'>
+    <signature family=3D'6' model=3D'94'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'mpx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-C=
lient.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=3D'Skylake-Client'>
+    <signature family=3D'6' model=3D'94'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'mpx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-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=3D'Skylake-Server-IBRS'>
+    <signature family=3D'6' model=3D'85'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'avx512bw'/>
+    <feature name=3D'avx512cd'/>
+    <feature name=3D'avx512dq'/>
+    <feature name=3D'avx512f'/>
+    <feature name=3D'avx512vl'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'clwb'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'mpx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-S=
erver.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=3D'Skylake-Server'>
+    <signature family=3D'6' model=3D'85'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
+    <feature name=3D'adx'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'avx'/>
+    <feature name=3D'avx2'/>
+    <feature name=3D'avx512bw'/>
+    <feature name=3D'avx512cd'/>
+    <feature name=3D'avx512dq'/>
+    <feature name=3D'avx512f'/>
+    <feature name=3D'avx512vl'/>
+    <feature name=3D'bmi1'/>
+    <feature name=3D'bmi2'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'clwb'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
+    <feature name=3D'fma'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fsgsbase'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'hle'/>
+    <feature name=3D'invpcid'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'movbe'/>
+    <feature name=3D'mpx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pcid'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pdpe1gb'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
+    <feature name=3D'rdseed'/>
+    <feature name=3D'rdtscp'/>
+    <feature name=3D'rtm'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'smap'/>
+    <feature name=3D'smep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'x2apic'/>
+    <feature name=3D'xgetbv1'/>
+    <feature name=3D'xsave'/>
+    <feature name=3D'xsavec'/>
+    <feature name=3D'xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-I=
BRS.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=3D'Westmere-IBRS'>
+    <signature family=3D'6' model=3D'44'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Westmere'>
+    <signature family=3D'6' model=3D'44'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'athlon'>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnow'/>
+    <feature name=3D'3dnowext'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'mmxext'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'core2duo'>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'coreduo'>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'cpu64-rhel5'>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'cpu64-rhel6'>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'fpu'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'vme'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'de'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'pse'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'tsc'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'msr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'pae'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000040'/>
+  </feature>
+  <feature name=3D'mce'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'cx8'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000100'/>
+  </feature>
+  <feature name=3D'apic'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000200'/>
+  </feature>
+  <feature name=3D'sep'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'mtrr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'pge'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00002000'/>
+  </feature>
+  <feature name=3D'mca'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00004000'/>
+  </feature>
+  <feature name=3D'cmov'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00008000'/>
+  </feature>
+  <feature name=3D'pat'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00010000'/>
+  </feature>
+  <feature name=3D'pse36'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00020000'/>
+  </feature>
+  <feature name=3D'pn'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00040000'/>
+  </feature>
+  <feature name=3D'clflush'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00080000'/>
+  </feature>
+  <feature name=3D'ds'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00200000'/>
+  </feature>
+  <feature name=3D'acpi'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'mmx'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00800000'/>
+  </feature>
+  <feature name=3D'fxsr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x01000000'/>
+  </feature>
+  <feature name=3D'sse'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'sse2'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'ss'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'ht'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x10000000'/>
+  </feature>
+  <feature name=3D'tm'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'ia64'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'pbe'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x80000000'/>
+  </feature>
+
+  <!-- standard features, ECX -->
+  <feature name=3D'pni'> <!-- sse3 -->
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'pclmuldq'> <!-- pclmulqdq -->
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'dtes64'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'monitor'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'ds_cpl'> <!-- ds-cpl -->
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'vmx'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'smx'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000040'/>
+  </feature>
+  <feature name=3D'est'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'tm2'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000100'/>
+  </feature>
+  <feature name=3D'ssse3'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000200'/>
+  </feature>
+  <feature name=3D'cid'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00000400'/>
+  </feature>
+  <feature name=3D'fma'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'cx16'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00002000'/>
+  </feature>
+  <feature name=3D'xtpr'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00004000'/>
+  </feature>
+  <feature name=3D'pdcm'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00008000'/>
+  </feature>
+  <feature name=3D'pcid'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00020000'/>
+  </feature>
+  <feature name=3D'dca'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00040000'/>
+  </feature>
+  <feature name=3D'sse4.1'> <!-- sse4-1, sse4_1 -->
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00080000'/>
+  </feature>
+  <feature name=3D'sse4.2'> <!-- sse4-2, sse4_2 -->
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00100000'/>
+  </feature>
+  <feature name=3D'x2apic'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00200000'/>
+  </feature>
+  <feature name=3D'movbe'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'popcnt'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x00800000'/>
+  </feature>
+  <feature name=3D'tsc-deadline'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x01000000'/>
+  </feature>
+  <feature name=3D'aes'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'xsave'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'osxsave'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'avx'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x10000000'/>
+  </feature>
+  <feature name=3D'f16c'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'rdrand'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'hypervisor'>
+    <cpuid eax_in=3D'0x01' ecx=3D'0x80000000'/>
+  </feature>
+
+  <!-- Termal Power and Management -->
+  <feature name=3D'arat'>
+    <cpuid eax_in=3D'0x06' eax=3D'0x00000004'/>
+  </feature>
+
+  <!-- cpuid function 0x7 ecx 0x0 features -->
+  <feature name=3D'fsgsbase'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'tsc_adjust'> <!-- tsc-adjust -->
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'bmi1'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'hle'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'avx2'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'smep'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'bmi2'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000100'/>
+  </feature>
+  <feature name=3D'erms'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000200'/>
+  </feature>
+  <feature name=3D'invpcid'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000400'/>
+  </feature>
+  <feature name=3D'rtm'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'cmt'> <!-- cqm -->
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'mpx'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00004000'/>
+  </feature>
+  <feature name=3D'avx512f'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00010000'/>
+  </feature>
+  <feature name=3D'avx512dq'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00020000'/>
+  </feature>
+  <feature name=3D'rdseed'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00040000'/>
+  </feature>
+  <feature name=3D'adx'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00080000'/>
+  </feature>
+  <feature name=3D'smap'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00100000'/>
+  </feature>
+  <feature name=3D'avx512ifma'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00200000'/>
+  </feature>
+  <feature name=3D'pcommit'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'clflushopt'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00800000'/>
+  </feature>
+  <feature name=3D'clwb'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x01000000'/>
+  </feature>
+  <feature name=3D'avx512pf'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'avx512er'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'avx512cd'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x10000000'/>
+  </feature>
+  <feature name=3D'sha-ni'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'avx512bw'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'avx512vl'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x80000000'/>
+  </feature>
+
+  <feature name=3D'avx512vbmi'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'pku'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'ospke'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'la57'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00010000'/>
+  </feature>
+
+  <feature name=3D'avx512-4vnniw'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'avx512-4fmaps'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'spec-ctrl'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'ssbd'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x80000000'/>
+  </feature>
+
+  <!-- Processor Extended State Enumeration sub leaf 1 -->
+  <feature name=3D'xsaveopt'>
+    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'xsavec'>
+    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'xgetbv1'>
+    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'xsaves' migratable=3D'no'>
+    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000008'/>
+  </feature>
+
+  <!-- cpuid level 0x0000000f:1 (edx) -->
+  <feature name=3D'mbm_total'>
+    <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'mbm_local'>
+    <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000004'/>
+  </feature>
+
+  <!-- extended features, EDX -->
+  <feature name=3D'syscall'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'nx'> <!-- xd -->
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00100000'/>
+  </feature>
+  <feature name=3D'mmxext'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'fxsr_opt'> <!-- ffxsr, fxsr-opt -->
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'pdpe1gb'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'rdtscp'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'lm'> <!-- i64 -->
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'3dnowext'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'3dnow'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x80000000'/>
+  </feature>
+
+  <!-- extended features, ECX -->
+  <feature name=3D'lahf_lm'> <!-- lahf-lm -->
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'cmp_legacy'> <!-- cmp-legacy -->
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'svm'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'extapic'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'cr8legacy'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'abm'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'sse4a'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000040'/>
+  </feature>
+  <feature name=3D'misalignsse'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'3dnowprefetch'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000100'/>
+  </feature>
+  <feature name=3D'osvw'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000200'/>
+  </feature>
+  <feature name=3D'ibs'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000400'/>
+  </feature>
+  <feature name=3D'xop'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'skinit'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'wdt'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00002000'/>
+  </feature>
+  <feature name=3D'lwp'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00008000'/>
+  </feature>
+  <feature name=3D'fma4'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00010000'/>
+  </feature>
+  <feature name=3D'tce'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00020000'/>
+  </feature>
+  <feature name=3D'cvt16'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00040000'/>
+  </feature>
+  <feature name=3D'nodeid_msr'> <!-- nodeid-msr -->
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00080000'/>
+  </feature>
+  <feature name=3D'tbm'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00200000'/>
+  </feature>
+  <feature name=3D'topoext'>
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'perfctr_core'> <!-- perfctr-core -->
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x00800000'/>
+  </feature>
+  <feature name=3D'perfctr_nb'> <!-- perfctr-nb -->
+    <cpuid eax_in=3D'0x80000001' ecx=3D'0x01000000'/>
+  </feature>
+
+  <!-- Advanced Power Management edx features -->
+  <feature name=3D'invtsc' migratable=3D'no'>
+    <cpuid eax_in=3D'0x80000007' edx=3D'0x00000100'/>
+  </feature>
+
+  <!-- More AMD-specific features -->
+  <feature name=3D'ibpb'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'amd-ssbd'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'0x01000000'/>
+  </feature>
+  <feature name=3D'virt-ssbd'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'amd-no-ssb'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'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=3D'kvm32'>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'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=3D'kvm64'>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'n270'>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'pentium'>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'pentium2'>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'pentium3'>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'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=3D'pentiumpro'>
+    <feature name=3D'apic'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'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=3D'phenom'>
+    <vendor name=3D'AMD'/>
+    <feature name=3D'3dnow'/>
+    <feature name=3D'3dnowext'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'fxsr_opt'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'mmxext'/>
+    <feature name=3D'monitor'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'qemu32'>
+    <feature name=3D'apic'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'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=3D'qemu64'>
+    <!-- These are supported only by TCG.  KVM supports them only if the
+         host does.  So we leave them out:
+
+<feature name=3D'abm'/>
+<feature name=3D'lahf_lm'/>
+<feature name=3D'popcnt'/>
+<feature name=3D'sse4a'/>
+    -->
+    <feature name=3D'apic'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'svm'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'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=3D'Intel' string=3D'GenuineIntel'/>
+  <vendor name=3D'AMD' string=3D'AuthenticAMD'/>
+</cpus>
--=20
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list