diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index d2c5af5797..39bad07f11 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -57,6 +57,7 @@
+
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index ae5293e85f..89b1317558 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -43,6 +43,7 @@ cpumap_data = [
'x86_EPYC-Milan.xml',
'x86_EPYC-Rome.xml',
'x86_features.xml',
+ 'x86_GraniteRapids.xml',
'x86_Haswell-IBRS.xml',
'x86_Haswell-noTSX-IBRS.xml',
'x86_Haswell-noTSX.xml',
diff --git a/src/cpu_map/x86_GraniteRapids.xml b/src/cpu_map/x86_GraniteRapids.xml
new file mode 100644
index 0000000000..6f7030ce39
--- /dev/null
+++ b/src/cpu_map/x86_GraniteRapids.xml
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index 6496cce45d..bac0b06683 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -112,6 +112,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 3a1070a2c3..6c455f7ab9 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -112,6 +112,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 0e6063501c..f103da3010 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -111,6 +111,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index ab8993c6e3..784c44219c 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -113,6 +113,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 2b48d78696..4be710044d 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -111,6 +111,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index b72369a737..2cdf516964 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -112,6 +112,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index 053a985456..670314ba3e 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -113,6 +113,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 3b5ce54f1a..13afe99cdb 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -113,6 +113,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index ea54504b47..71c05e0e97 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -112,6 +112,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index bb40bf01e9..5ca6d0fdac 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -117,6 +117,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 60621e9bdc..133ee4d723 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -112,6 +112,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index c0e212cae0..f378000c2b 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -116,6 +116,7 @@
Haswell-noTSX
Haswell-IBRS
Haswell
+ GraniteRapids
EPYC-Rome
EPYC-Milan
EPYC-IBPB