diff --git a/tests/cputest.c b/tests/cputest.c index 7901693bf8..dda1abe7b6 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -856,6 +856,7 @@ mymain(void) DO_TEST_CPUID("x86", "Core-i7-3520M", false); DO_TEST_CPUID("x86", "Core-i7-3740QM", true); DO_TEST_CPUID("x86", "Core-i7-3770", true); + DO_TEST_CPUID("x86", "Core-i7-4600U", true); #if WITH_QEMU && WITH_YAJL qemuTestDriverFree(&driver); diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml new file mode 100644 index 0000000000..89c95a81bf --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml @@ -0,0 +1,28 @@ + + x86_64 + Haswell-noTSX + Intel + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml new file mode 100644 index 0000000000..6edbf8ff9b --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml @@ -0,0 +1,28 @@ + + x86_64 + Haswell-noTSX + Intel + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml new file mode 100644 index 0000000000..2f6a925899 --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml @@ -0,0 +1,13 @@ + + x86_64 + Haswell-noTSX + + + + + + + + + + diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.json b/tests/cputestdata/x86-cpuid-Core-i7-4600U.json new file mode 100644 index 0000000000..2b15fadfdc --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U.json @@ -0,0 +1,82 @@ +{ + "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-cpuid-Core-i7-4600U.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml new file mode 100644 index 0000000000..4c0c259c3c --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +