Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
Notes:
Version 3:
- no change
Version 2:
- no change
tests/cputestdata/x86_64-cpuid-A10-5800K.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Core-i5-2500.json | 88 ----------------------
tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 82 --------------------
tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Core-i5-6600.json | 82 --------------------
tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Core-i7-3770.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json | 82 --------------------
tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json | 88 ----------------------
tests/cputestdata/x86_64-cpuid-Core2-E6850.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Opteron-2350.json | 71 -----------------
tests/cputestdata/x86_64-cpuid-Opteron-6234.json | 88 ----------------------
tests/cputestdata/x86_64-cpuid-Phenom-B95.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 88 ----------------------
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json | 71 -----------------
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json | 77 -------------------
tests/cputestdata/x86_64-cpuid-Xeon-W3520.json | 77 -------------------
19 files changed, 1510 deletions(-)
delete mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
delete mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.json
b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
deleted file mode 100644
index 53b39ad03..000000000
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 9
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 2165747
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 642779136
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 10
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 3065524739
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 126614527
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 21,
- "id": "family"
-}
-
-{
- "return": 16,
- "id": "model"
-}
-
-{
- "return": 1,
- "id": "stepping"
-}
-
-{
- "return": "AMD A10-5800K APU with Radeon(tm) HD Graphics ",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
deleted file mode 100644
index 156b77248..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2545558019
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 42,
- "id": "model"
-}
-
-{
- "return": 7,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
deleted file mode 100644
index 6dc2a803a..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2545558019
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 42,
- "id": "model"
-}
-
-{
- "return": 7,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
deleted file mode 100644
index e715ca082..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 33
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 4027
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369187
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 60,
- "id": "model"
-}
-
-{
- "return": 3,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
deleted file mode 100644
index da296f945..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 15
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 289
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 10244027
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369155
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 94,
- "id": "model"
-}
-
-{
- "return": 3,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
deleted file mode 100644
index dd3544900..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2545558019
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 42,
- "id": "model"
-}
-
-{
- "return": 7,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
deleted file mode 100644
index 2b1349f17..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 643
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4156170787
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 58,
- "id": "model"
-}
-
-{
- "return": 9,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
deleted file mode 100644
index d83e7788b..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 643
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4156170755
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 58,
- "id": "model"
-}
-
-{
- "return": 9,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
deleted file mode 100644
index 2b15fadfd..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 33
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 1963
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369187
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 69,
- "id": "model"
-}
-
-{
- "return": 1,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
deleted file mode 100644
index b570d46b7..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 289
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 1839035
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369187
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 61,
- "id": "model"
-}
-
-{
- "return": 4,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
deleted file mode 100644
index 44be368f7..000000000
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 537921536
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2166366721
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 15,
- "id": "model"
-}
-
-{
- "return": 11,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Core(TM)2 Duo CPU E6850 @ 3.00GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
deleted file mode 100644
index 79b5afad0..000000000
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 1
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1015
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 3864004608
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2174754817
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 126614527
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 16,
- "id": "family"
-}
-
-{
- "return": 2,
- "id": "model"
-}
-
-{
- "return": 3,
- "id": "stepping"
-}
-
-{
- "return": "Quad-Core AMD Opteron(tm) Processor 2350",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
deleted file mode 100644
index 0df386076..000000000
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 9
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 68595
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 668204031
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2545426947
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 126614527
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 21,
- "id": "family"
-}
-
-{
- "return": 1,
- "id": "model"
-}
-
-{
- "return": 2,
- "id": "stepping"
-}
-
-{
- "return": "AMD Opteron(TM) Processor 6234 ",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
deleted file mode 100644
index 5f5badda9..000000000
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 9
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1011
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 3862956032
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2157977601
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 126614527
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 16,
- "id": "family"
-}
-
-{
- "return": 4,
- "id": "model"
-}
-
-{
- "return": 2,
- "id": "stepping"
-}
-
-{
- "return": "AMD Phenom(tm) II X4 B95 Processor",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
deleted file mode 100644
index 10fbe069f..000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 6,
- "features": 4
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 7
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 289
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 0
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 10244027
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369187
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 94,
- "id": "model"
-}
-
-{
- "return": 3,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
deleted file mode 100644
index f1affa46b..000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 33
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 1963
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369155
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 63,
- "id": "model"
-}
-
-{
- "return": 2,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
deleted file mode 100644
index 2cd15f64b..000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 33
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 1961
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 4160369187
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 63,
- "id": "model"
-}
-
-{
- "return": 2,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
deleted file mode 100644
index a8846132e..000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 739248128
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2210013699
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 47,
- "id": "model"
-}
-
-{
- "return": 2,
- "id": "stepping"
-}
-
-{
- "return": " Intel(R) Xeon(R) CPU E7- 4820 @ 2.00GHz",
- "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
deleted file mode 100644
index c75594d4e..000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "return": [
- {
- "cpuid-register": "EAX",
- "cpuid-input-ecx": 1,
- "cpuid-input-eax": 13,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483658,
- "features": 0
- },
- {
- "cpuid-register": "EAX",
- "cpuid-input-eax": 1073741825,
- "features": 16777467
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 3221225473,
- "features": 0
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483655,
- "features": 0
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 2147483649,
- "features": 1
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 2147483649,
- "features": 672139264
- },
- {
- "cpuid-register": "EBX",
- "cpuid-input-ecx": 0,
- "cpuid-input-eax": 7,
- "features": 2
- },
- {
- "cpuid-register": "ECX",
- "cpuid-input-eax": 1,
- "features": 2159550977
- },
- {
- "cpuid-register": "EDX",
- "cpuid-input-eax": 1,
- "features": 260832255
- }
- ],
- "id": "feature-words"
-}
-
-{
- "return": 6,
- "id": "family"
-}
-
-{
- "return": 26,
- "id": "model"
-}
-
-{
- "return": 5,
- "id": "stepping"
-}
-
-{
- "return": "Intel(R) Xeon(R) CPU W3520 @ 2.67GHz",
- "id": "model-id"
-}
--
2.11.1