diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3bacf2cf95772e5276b30343c06d51f4cb1d5b7f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a97702df90935e5b12979bc4613fb399f793f6bd
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..510cd97a5b7ea6cf74e9d893aa32f3fd6e54bdc3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1581f800f115c379ade22269a56884f91c4fc21f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..510cd97a5b7ea6cf74e9d893aa32f3fd6e54bdc3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1581f800f115c379ade22269a56884f91c4fc21f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..601554a8157489d2ef8c94f3d7721e657d4aa798
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a714379c08a9c81500817bc1ec66efbaef4fd77
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..510cd97a5b7ea6cf74e9d893aa32f3fd6e54bdc3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13032d0d2a5789e5adc848ef3dca501f6ee604d7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f25d2888eb97f92cfa11f5c75ba79a36cdbe3832
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df99a218079c13851186cd11c02df37dc205494e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..601554a8157489d2ef8c94f3d7721e657d4aa798
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e596bf119f59583f610b09789ad6a834430b5f17
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f25d2888eb97f92cfa11f5c75ba79a36cdbe3832
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..666c375368ada05bb175d74cc0442d5cdc3522c3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dbc978e7342e671b2d45e85c1305aa390e8f98eb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..86896de80955277df80a2b707a3659a3381cc7f9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a0477f788550ddce45bf40f649e3ff5400239c7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..86896de80955277df80a2b707a3659a3381cc7f9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a0477f788550ddce45bf40f649e3ff5400239c7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..edc433c9ae615a5cedfb73e9f22d33dc5b04e52e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18e4baf3a6e2ad6ece1f3016897130bcc57bfa3e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af4f6f7ab1c6339e8ce16d1e8d836b182ef3222c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f6fe540555475355fadeeb7e51494dc884294fc
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7541dff65a216f8321e3dde1a925449dba4bcd85
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4dcd74103b1dd1aa7a956a34ed444d92e3381a1a
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4cfbcef2d7700391be8e027bd32fdcb1286b28d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3910eb6e577eb26fc9cd77f35da41723cac8016c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a8cd01ff46b667440ce993f2309fc708ebb04c5c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a177705a8a00f95b02b3b696c40d334b750b959
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2584042339e5036551743a97d205be13fc2a19b2
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea29065062f8d2590464be7841522a868b2afd7e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c2367a3d043afc801d490894537f33c0b20f767
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a66b5bdd6f3f616a792e6250ba80d8a9f4861b9f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4c194af10f644cb0e9e9dd3d6f9a40b08b205108
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7e0ee6f2333bf0072f4745ae5afa6d6a754ab74
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cddc4a675ebd5003c21f808b093db0d2fd8c237f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49737fbdb172bb0ed8ea921f8db19ffbc00e863c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml
new file mode 100644
index 0000000000000000000000000000000000000000..febef1eddc0188a3209d32e9bd6b32ec38e79c32
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+