From 7a53afcd1011a0d34daa355977ef294f0c80fc1d Mon Sep 17 00:00:00 2001
From: Yingle Hou <houyingle@hygon.cn>
Date: Thu, 12 Dec 2019 10:58:19 +0800
Subject: [PATCH] cpu: Add new Dhyana CPU model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add Hygon Dhyana CPU model to the processor model.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Yingle Hou <houyingle@hygon.cn>
---
 src/cpu_map/Makefile.inc.am                   |  1 +
 src/cpu_map/index.xml                         |  3 +
 src/cpu_map/x86_Dhyana.xml                    | 70 +++++++++++++++++++
 src/cpu_map/x86_vendors.xml                   |  1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
 10 files changed, 81 insertions(+)
 create mode 100644 src/cpu_map/x86_Dhyana.xml

diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
index 7eb86c8fc7..e935178304 100644
--- a/src/cpu_map/Makefile.inc.am
+++ b/src/cpu_map/Makefile.inc.am
@@ -25,6 +25,7 @@ cpumap_DATA = \
 	cpu_map/x86_coreduo.xml \
 	cpu_map/x86_cpu64-rhel5.xml \
 	cpu_map/x86_cpu64-rhel6.xml \
+	cpu_map/x86_Dhyana.xml \
 	cpu_map/x86_EPYC.xml \
 	cpu_map/x86_EPYC-IBPB.xml \
 	cpu_map/x86_Haswell.xml \
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index ed45083dca..ffb2f6fe1b 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -60,6 +60,9 @@
     <include filename="x86_Opteron_G5.xml"/>
     <include filename="x86_EPYC.xml"/>
     <include filename="x86_EPYC-IBPB.xml"/>
+
+    <!-- Hygon CPU models -->
+    <include filename="x86_Dhyana.xml"/>
   </arch>
 
   <arch name='ppc64'>
diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
new file mode 100644
index 0000000000..cbc8020a94
--- /dev/null
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -0,0 +1,70 @@
+<cpus>
+  <model name='Dhyana'>
+    <signature family='24' model='0'/> <!-- 900f00 -->
+    <vendor name='Hygon'/>
+    <feature name='3dnowprefetch'/>
+    <feature name='abm'/>
+    <feature name='adx'/>
+    <feature name='apic'/>
+    <feature name='arat'/>
+    <feature name='avx'/>
+    <feature name='avx2'/>
+    <feature name='bmi1'/>
+    <feature name='bmi2'/>
+    <feature name='clflush'/>
+    <feature name='clflushopt'/>
+    <feature name='cmov'/>
+    <feature name='cr8legacy'/>
+    <feature name='cx16'/>
+    <feature name='cx8'/>
+    <feature name='de'/>
+    <feature name='f16c'/>
+    <feature name='fma'/>
+    <feature name='fpu'/>
+    <feature name='fsgsbase'/>
+    <feature name='fxsr'/>
+    <feature name='fxsr_opt'/>
+    <feature name='ibpb'/>
+    <feature name='lahf_lm'/>
+    <feature name='lm'/>
+    <feature name='mca'/>
+    <feature name='mce'/>
+    <feature name='misalignsse'/>
+    <feature name='mmx'/>
+    <feature name='mmxext'/>
+    <feature name='monitor'/>
+    <feature name='movbe'/>
+    <feature name='msr'/>
+    <feature name='mtrr'/>
+    <feature name='nx'/>
+    <feature name='osvw'/>
+    <feature name='pae'/>
+    <feature name='pat'/>
+    <feature name='pdpe1gb'/>
+    <feature name='pge'/>
+    <feature name='pni'/>
+    <feature name='popcnt'/>
+    <feature name='pse'/>
+    <feature name='pse36'/>
+    <feature name='rdrand'/>
+    <feature name='rdseed'/>
+    <feature name='rdtscp'/>
+    <feature name='sep'/>
+    <feature name='smap'/>
+    <feature name='smep'/>
+    <feature name='sse'/>
+    <feature name='sse2'/>
+    <feature name='sse4.1'/>
+    <feature name='sse4.2'/>
+    <feature name='sse4a'/>
+    <feature name='ssse3'/>
+    <feature name='svm'/>
+    <feature name='syscall'/>
+    <feature name='tsc'/>
+    <feature name='vme'/>
+    <feature name='xgetbv1'/>
+    <feature name='xsave'/>
+    <feature name='xsavec'/>
+    <feature name='xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_vendors.xml b/src/cpu_map/x86_vendors.xml
index 418712af21..840179d1f8 100644
--- a/src/cpu_map/x86_vendors.xml
+++ b/src/cpu_map/x86_vendors.xml
@@ -1,4 +1,5 @@
 <cpus>
   <vendor name='Intel' string='GenuineIntel'/>
   <vendor name='AMD' string='AuthenticAMD'/>
+  <vendor name='Hygon' string='HygonGenuine'/>
 </cpus>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 6363aa4a3f..f4ddb66e38 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -87,6 +87,7 @@
       <model usable='yes'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='yes'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index b6168e684d..5bfd065986 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -97,6 +97,7 @@
       <model usable='no'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='no'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 54cb76e77b..bcc8bbcc7a 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -86,6 +86,7 @@
       <model usable='yes'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='yes'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 0842a75523..c4c6bfb564 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -87,6 +87,7 @@
       <model usable='yes'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='yes'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index c415535a91..a7f8d9c5ee 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -97,6 +97,7 @@
       <model usable='no'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='no'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 212e0a5666..f0e0f182a4 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -86,6 +86,7 @@
       <model usable='yes'>Haswell</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='no'>EPYC</model>
+      <model usable='no'>Dhyana</model>
       <model usable='yes'>Conroe</model>
       <model usable='no'>Cascadelake-Server</model>
       <model usable='yes'>Broadwell-noTSX-IBRS</model>
-- 
GitLab