From f52c02d394ca21b5af2c039424c52522554d1bbf Mon Sep 17 00:00:00 2001
From: Veselin Georgiev <anrieff@gmail.com>
Date: Thu, 7 Jul 2016 00:44:45 +0300
Subject: [PATCH] Update all tests: add fields for L4 cache size, assoc. and
 line size.

---
 tests/amd/bobcat/brazos-zacate.test              | 3 +++
 tests/amd/bulldozer/bulldozer-x4.test            | 3 +++
 tests/amd/bulldozer/vishera-x4.test              | 3 +++
 tests/amd/k10/athlon-2-champlain-mobile.test     | 3 +++
 tests/amd/k10/athlon-2-kuma.test                 | 3 +++
 tests/amd/k10/athlon-2-propus-2.test             | 3 +++
 tests/amd/k10/athlon-2-propus-3.test             | 3 +++
 tests/amd/k10/athlon-2-propus.test               | 3 +++
 tests/amd/k10/athlon-2-regor.test                | 3 +++
 tests/amd/k10/magny-cours.test                   | 3 +++
 tests/amd/k10/phenom-2-deneb.test                | 3 +++
 tests/amd/k10/phenom-2-heka.test                 | 3 +++
 tests/amd/k10/phenom-2-thuban.test               | 3 +++
 tests/amd/k10/phenom-agena.test                  | 3 +++
 tests/amd/k10/sempron-sargas.test                | 3 +++
 tests/amd/k7/athlon-thoroughbred.test            | 3 +++
 tests/amd/k7/duron-applebred.test                | 3 +++
 tests/amd/k7/sempron-barton.test                 | 3 +++
 tests/amd/k8/athlon-64-brisbane.test             | 3 +++
 tests/amd/k8/athlon-64-venice.test               | 3 +++
 tests/amd/k8/mobile-sempron-64-keene.test        | 3 +++
 tests/amd/k8/mobile-sempron-64-sonora.test       | 3 +++
 tests/amd/k8/opteron-denmark.test                | 3 +++
 tests/amd/k8/sempron-64-sparta.test              | 3 +++
 tests/amd/k8/turion-64-lancaster.test            | 3 +++
 tests/intel/atom/atom-diamondville-dualcore.test | 3 +++
 tests/intel/atom/atom-diamondville.test          | 3 +++
 tests/intel/atom/atom-pineview-2.test            | 3 +++
 tests/intel/atom/atom-pineview.test              | 3 +++
 tests/intel/core2/allendale.test                 | 3 +++
 tests/intel/core2/celeron-wolfdale.test          | 3 +++
 tests/intel/core2/conroe-1m.test                 | 3 +++
 tests/intel/core2/conroe-l-celeron.test          | 3 +++
 tests/intel/core2/conroe-l.test                  | 3 +++
 tests/intel/core2/conroe.test                    | 3 +++
 tests/intel/core2/kentsfield.test                | 3 +++
 tests/intel/core2/merom-2m.test                  | 3 +++
 tests/intel/core2/merom.test                     | 3 +++
 tests/intel/core2/penryn-3m.test                 | 3 +++
 tests/intel/core2/penryn-mobile.test             | 3 +++
 tests/intel/core2/wolfdale.test                  | 3 +++
 tests/intel/core2/xeon-clovertown.test           | 3 +++
 tests/intel/core2/xeon-harpertown.test           | 3 +++
 tests/intel/core2/xeon-wolfdale.test             | 3 +++
 tests/intel/core2/yonah-2.test                   | 3 +++
 tests/intel/core2/yonah-3.test                   | 3 +++
 tests/intel/core2/yonah.test                     | 3 +++
 tests/intel/core2/yorkfield-2m.test              | 3 +++
 tests/intel/core2/yorkfield.test                 | 3 +++
 tests/intel/haswell/haswell-i3.test              | 3 +++
 tests/intel/haswell/haswell-i5.test              | 3 +++
 tests/intel/haswell/haswell-i7.test              | 3 +++
 tests/intel/nehalem/arrandale-i5.test            | 3 +++
 tests/intel/nehalem/arrandale-i7.test            | 3 +++
 tests/intel/nehalem/arrandale-mobile.test        | 3 +++
 tests/intel/nehalem/bloomfield.test              | 3 +++
 tests/intel/nehalem/gulftown-i7.test             | 3 +++
 tests/intel/nehalem/lynnfield-i7.test            | 3 +++
 tests/intel/nehalem/xeon-bloomfield.test         | 3 +++
 tests/intel/nehalem/xeon-gainestown.test         | 3 +++
 tests/intel/nehalem/xeon-gulftown.test           | 3 +++
 tests/intel/netburst/celeron-northwood.test.test | 3 +++
 tests/intel/netburst/celeron-prescott.test       | 3 +++
 tests/intel/netburst/celeron-willamette.test     | 3 +++
 tests/intel/netburst/mobile-p4-northwood.test    | 3 +++
 tests/intel/netburst/p4-northwood.test           | 3 +++
 tests/intel/netburst/p4-prescott-ht.test         | 3 +++
 tests/intel/netburst/xeon-prestonia.test         | 3 +++
 tests/intel/p2/pentium-coppermine.test           | 3 +++
 tests/intel/p2/pentium-dixon.test                | 3 +++
 tests/intel/p2/petium-m-dothan.test              | 3 +++
 tests/intel/sandy/celeron-sandy.test             | 3 +++
 tests/intel/sandy/ivy-bridge-i5.test             | 3 +++
 tests/intel/sandy/sandy-bridge-e-i7.test         | 3 +++
 tests/intel/sandy/sandy-bridge-i7.test           | 3 +++
 tests/intel/sandy/xeon-sandy.test                | 3 +++
 tests/intel/skylake/skylake-i5.test              | 3 +++
 tests/run_tests.py                               | 7 ++++---
 78 files changed, 235 insertions(+), 3 deletions(-)

diff --git a/tests/amd/bobcat/brazos-zacate.test b/tests/amd/bobcat/brazos-zacate.test
index aab3a0c..ffd5bc4 100644
--- a/tests/amd/bobcat/brazos-zacate.test
+++ b/tests/amd/bobcat/brazos-zacate.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 32
 512
 0
+-1
 8
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (authoritative)
 Brazos Zacate (Dual-core)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor ssse3 cx16 syscall popcnt mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/bulldozer/bulldozer-x4.test b/tests/amd/bulldozer/bulldozer-x4.test
index 1942f20..ed093c9 100644
--- a/tests/amd/bulldozer/bulldozer-x4.test
+++ b/tests/amd/bulldozer/bulldozer-x4.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 2048
 8192
+-1
 4
 16
 64
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Bulldozer X4
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma4 cpb
diff --git a/tests/amd/bulldozer/vishera-x4.test b/tests/amd/bulldozer/vishera-x4.test
index a8002b2..16091bb 100644
--- a/tests/amd/bulldozer/vishera-x4.test
+++ b/tests/amd/bulldozer/vishera-x4.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 2048
 8192
+-1
 4
 16
 64
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Vishera X4
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd 100mhzsteps hwpstate constant_tsc xop fma3 fma4 tbm f16c cpb aperfmperf bmi1
diff --git a/tests/amd/k10/athlon-2-champlain-mobile.test b/tests/amd/k10/athlon-2-champlain-mobile.test
index df22af8..0744310 100644
--- a/tests/amd/k10/athlon-2-champlain-mobile.test
+++ b/tests/amd/k10/athlon-2-champlain-mobile.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (authoritative)
 Athlon II (Champlain)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/athlon-2-kuma.test b/tests/amd/k10/athlon-2-kuma.test
index 1add41c..4059a35 100644
--- a/tests/amd/k10/athlon-2-kuma.test
+++ b/tests/amd/k10/athlon-2-kuma.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 2048
+-1
 2
 16
 32
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Athlon X2 (Kuma)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/athlon-2-propus-2.test b/tests/amd/k10/athlon-2-propus-2.test
index bb6a38b..e28d9ce 100644
--- a/tests/amd/k10/athlon-2-propus-2.test
+++ b/tests/amd/k10/athlon-2-propus-2.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (authoritative)
 Athlon II X4 (Propus)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/athlon-2-propus-3.test b/tests/amd/k10/athlon-2-propus-3.test
index 7dd2f37..a60f655 100644
--- a/tests/amd/k10/athlon-2-propus-3.test
+++ b/tests/amd/k10/athlon-2-propus-3.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (authoritative)
 Athlon II X4 (Propus)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/athlon-2-propus.test b/tests/amd/k10/athlon-2-propus.test
index bb6a38b..e28d9ce 100644
--- a/tests/amd/k10/athlon-2-propus.test
+++ b/tests/amd/k10/athlon-2-propus.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (authoritative)
 Athlon II X4 (Propus)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/athlon-2-regor.test b/tests/amd/k10/athlon-2-regor.test
index 630dfa3..73ca420 100644
--- a/tests/amd/k10/athlon-2-regor.test
+++ b/tests/amd/k10/athlon-2-regor.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 1024
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (authoritative)
 Athlon II X2 (Regor)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/magny-cours.test b/tests/amd/k10/magny-cours.test
index 007b1cc..927f560 100644
--- a/tests/amd/k10/magny-cours.test
+++ b/tests/amd/k10/magny-cours.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 10240
+-1
 2
 16
 96
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Magny-Cours Opteron
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/phenom-2-deneb.test b/tests/amd/k10/phenom-2-deneb.test
index b6ad6be..07a2639 100644
--- a/tests/amd/k10/phenom-2-deneb.test
+++ b/tests/amd/k10/phenom-2-deneb.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 6144
+-1
 2
 16
 48
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Phenom II X4 (Deneb)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/phenom-2-heka.test b/tests/amd/k10/phenom-2-heka.test
index eab45b9..9f28123 100644
--- a/tests/amd/k10/phenom-2-heka.test
+++ b/tests/amd/k10/phenom-2-heka.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 6144
+-1
 2
 16
 48
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Phenom II X3 (Heka)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/phenom-2-thuban.test b/tests/amd/k10/phenom-2-thuban.test
index ca83587..840dab2 100644
--- a/tests/amd/k10/phenom-2-thuban.test
+++ b/tests/amd/k10/phenom-2-thuban.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 512
 6144
+-1
 2
 16
 48
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Phenom II X6 (Thuban)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc cpb
diff --git a/tests/amd/k10/phenom-agena.test b/tests/amd/k10/phenom-agena.test
index 1fce189..e2bd247 100644
--- a/tests/amd/k10/phenom-agena.test
+++ b/tests/amd/k10/phenom-agena.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 512
 2048
+-1
 2
 16
 32
+-1
 64
 64
 64
+-1
 128 (authoritative)
 Phenom X4 (Agena/512K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k10/sempron-sargas.test b/tests/amd/k10/sempron-sargas.test
index 52e02fd..21e4007 100644
--- a/tests/amd/k10/sempron-sargas.test
+++ b/tests/amd/k10/sempron-sargas.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 64
 1024
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (authoritative)
 Sempron (Sargas)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k7/athlon-thoroughbred.test b/tests/amd/k7/athlon-thoroughbred.test
index d3934f6..2be7d28 100644
--- a/tests/amd/k7/athlon-thoroughbred.test
+++ b/tests/amd/k7/athlon-thoroughbred.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 256
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Athlon XP (Thoroughbred)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 mmx fxsr sse syscall mmxext 3dnow 3dnowext ts
diff --git a/tests/amd/k7/duron-applebred.test b/tests/amd/k7/duron-applebred.test
index 29abe8a..99e76fb 100644
--- a/tests/amd/k7/duron-applebred.test
+++ b/tests/amd/k7/duron-applebred.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 64
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Duron (Applebred)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 mmx fxsr sse syscall mmxext 3dnow 3dnowext ts
diff --git a/tests/amd/k7/sempron-barton.test b/tests/amd/k7/sempron-barton.test
index 5c51cde..7221dff 100644
--- a/tests/amd/k7/sempron-barton.test
+++ b/tests/amd/k7/sempron-barton.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Sempron (Barton)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 mmx fxsr sse syscall mmxext 3dnow 3dnowext ts fid vid
diff --git a/tests/amd/k8/athlon-64-brisbane.test b/tests/amd/k8/athlon-64-brisbane.test
index b359a9d..614af90 100644
--- a/tests/amd/k8/athlon-64-brisbane.test
+++ b/tests/amd/k8/athlon-64-brisbane.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Athlon 64 X2 (Brisbane/512K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni cx16 syscall mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm 3dnowprefetch ts fid vid ttp tm_amd stc 100mhzsteps
diff --git a/tests/amd/k8/athlon-64-venice.test b/tests/amd/k8/athlon-64-venice.test
index 241ae83..ee73b4c 100644
--- a/tests/amd/k8/athlon-64-venice.test
+++ b/tests/amd/k8/athlon-64-venice.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Athlon 64 (Venice/512K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 pni syscall mmxext 3dnow 3dnowext nx fxsr_opt lm lahf_lm ts fid vid ttp tm_amd stc
diff --git a/tests/amd/k8/mobile-sempron-64-keene.test b/tests/amd/k8/mobile-sempron-64-keene.test
index f636a45..dd8e273 100644
--- a/tests/amd/k8/mobile-sempron-64-keene.test
+++ b/tests/amd/k8/mobile-sempron-64-keene.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 512
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Mobile Sempron 64 (Keene/512K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 pni cx16 syscall mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm ts fid vid ttp tm_amd stc
diff --git a/tests/amd/k8/mobile-sempron-64-sonora.test b/tests/amd/k8/mobile-sempron-64-sonora.test
index 6b2b7dc..545884f 100644
--- a/tests/amd/k8/mobile-sempron-64-sonora.test
+++ b/tests/amd/k8/mobile-sempron-64-sonora.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 128
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Mobile Sempron 64 (Sonora/128K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall mmxext 3dnow 3dnowext nx fxsr_opt lahf_lm ts fid vid ttp
diff --git a/tests/amd/k8/opteron-denmark.test b/tests/amd/k8/opteron-denmark.test
index 873851f..95bd391 100644
--- a/tests/amd/k8/opteron-denmark.test
+++ b/tests/amd/k8/opteron-denmark.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 1024
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Opteron (Dual Core)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni syscall mmxext 3dnow 3dnowext nx fxsr_opt lm lahf_lm cmp_legacy ts fid vid ttp
diff --git a/tests/amd/k8/sempron-64-sparta.test b/tests/amd/k8/sempron-64-sparta.test
index a50e60a..5d946c5 100644
--- a/tests/amd/k8/sempron-64-sparta.test
+++ b/tests/amd/k8/sempron-64-sparta.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 256
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Sempron 64 (Sparta/256K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 pni cx16 syscall mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm 3dnowprefetch ts fid vid ttp tm_amd stc 100mhzsteps
diff --git a/tests/amd/k8/turion-64-lancaster.test b/tests/amd/k8/turion-64-lancaster.test
index 63aa99d..f21ab9e 100644
--- a/tests/amd/k8/turion-64-lancaster.test
+++ b/tests/amd/k8/turion-64-lancaster.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 1024
 0
+-1
 2
 16
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Turion 64 (Lancaster/1024K)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 pni syscall mmxext 3dnow 3dnowext nx fxsr_opt lm lahf_lm ts fid vid ttp tm_amd stc
diff --git a/tests/intel/atom/atom-diamondville-dualcore.test b/tests/intel/atom/atom-diamondville-dualcore.test
index fad815c..c1a3281 100644
--- a/tests/intel/atom/atom-diamondville-dualcore.test
+++ b/tests/intel/atom/atom-diamondville-dualcore.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 512
 -1
+-1
 6
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Atom (Diamondville)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm xd movbe lm lahf_lm
diff --git a/tests/intel/atom/atom-diamondville.test b/tests/intel/atom/atom-diamondville.test
index 50a5648..0d44f27 100644
--- a/tests/intel/atom/atom-diamondville.test
+++ b/tests/intel/atom/atom-diamondville.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 512
 -1
+-1
 6
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Atom (Diamondville)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 xtpr pdcm xd movbe lahf_lm
diff --git a/tests/intel/atom/atom-pineview-2.test b/tests/intel/atom/atom-pineview-2.test
index 5ac2ca8..40c4fae 100644
--- a/tests/intel/atom/atom-pineview-2.test
+++ b/tests/intel/atom/atom-pineview-2.test
@@ -82,12 +82,15 @@ intel_fn11[3]=07280203 00000000 00000000 00000503
 32
 512
 -1
+-1
 6
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Atom (Pineview)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm xd movbe lm lahf_lm
diff --git a/tests/intel/atom/atom-pineview.test b/tests/intel/atom/atom-pineview.test
index e087731..6250e3f 100644
--- a/tests/intel/atom/atom-pineview.test
+++ b/tests/intel/atom/atom-pineview.test
@@ -82,12 +82,15 @@ intel_fn11[3]=07280203 00000000 00000000 00000503
 32
 512
 -1
+-1
 6
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Atom (Pineview)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm syscall xd movbe lm lahf_lm
diff --git a/tests/intel/core2/allendale.test b/tests/intel/core2/allendale.test
index 484ae1c..17ad5de 100644
--- a/tests/intel/core2/allendale.test
+++ b/tests/intel/core2/allendale.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Allendale (Core 2 Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/celeron-wolfdale.test b/tests/intel/core2/celeron-wolfdale.test
index d9d1f80..1f67060 100644
--- a/tests/intel/core2/celeron-wolfdale.test
+++ b/tests/intel/core2/celeron-wolfdale.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 32
 1024
 -1
+-1
 8
 4
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Celeron Wolfdale 1M
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd xsave osxsave lm lahf_lm
diff --git a/tests/intel/core2/conroe-1m.test b/tests/intel/core2/conroe-1m.test
index 4f805c5..f905090 100644
--- a/tests/intel/core2/conroe-1m.test
+++ b/tests/intel/core2/conroe-1m.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 1024
 -1
+-1
 8
 4
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Conroe (Core 2 Duo) 1024K
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/conroe-l-celeron.test b/tests/intel/core2/conroe-l-celeron.test
index 0a101bf..e0c2cd7 100644
--- a/tests/intel/core2/conroe-l-celeron.test
+++ b/tests/intel/core2/conroe-l-celeron.test
@@ -82,12 +82,15 @@ intel_fn11[3]=07280202 00000000 00000000 00000000
 32
 512
 -1
+-1
 8
 2
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Conroe-L (Celeron)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe pni dts64 monitor ds_cpl tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/conroe-l.test b/tests/intel/core2/conroe-l.test
index d52950c..3461800 100644
--- a/tests/intel/core2/conroe-l.test
+++ b/tests/intel/core2/conroe-l.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 512
 -1
+-1
 8
 2
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Conroe-L (Allendale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm lm lahf_lm
diff --git a/tests/intel/core2/conroe.test b/tests/intel/core2/conroe.test
index e04af1c..a4eab6c 100644
--- a/tests/intel/core2/conroe.test
+++ b/tests/intel/core2/conroe.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 4096
 -1
+-1
 8
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Conroe (Core 2 Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/kentsfield.test b/tests/intel/core2/kentsfield.test
index ef8a1d2..04c25bb 100644
--- a/tests/intel/core2/kentsfield.test
+++ b/tests/intel/core2/kentsfield.test
@@ -82,12 +82,15 @@ intel_fn11[3]=07280202 00000000 00000000 00000503
 32
 4096
 -1
+-1
 8
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Kentsfield (Core 2 Quad)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm lm lahf_lm
diff --git a/tests/intel/core2/merom-2m.test b/tests/intel/core2/merom-2m.test
index cb3da92..3f3b7f3 100644
--- a/tests/intel/core2/merom-2m.test
+++ b/tests/intel/core2/merom-2m.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Merom (Core 2 Duo) 2048K
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/merom.test b/tests/intel/core2/merom.test
index 47b9159..fbd4dd5 100644
--- a/tests/intel/core2/merom.test
+++ b/tests/intel/core2/merom.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 4096
 -1
+-1
 8
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Merom (Core 2 Duo) 4096K
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/penryn-3m.test b/tests/intel/core2/penryn-3m.test
index 263431b..b45895a 100644
--- a/tests/intel/core2/penryn-3m.test
+++ b/tests/intel/core2/penryn-3m.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 3072
 -1
+-1
 8
 12
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Penryn (Core 2 Duo) 3M
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
diff --git a/tests/intel/core2/penryn-mobile.test b/tests/intel/core2/penryn-mobile.test
index bff3323..76432ab 100644
--- a/tests/intel/core2/penryn-mobile.test
+++ b/tests/intel/core2/penryn-mobile.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 32
 1024
 -1
+-1
 8
 4
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Penryn (Core 2 Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm syscall xd xsave osxsave lm lahf_lm
diff --git a/tests/intel/core2/wolfdale.test b/tests/intel/core2/wolfdale.test
index a34505e..8adf90d 100644
--- a/tests/intel/core2/wolfdale.test
+++ b/tests/intel/core2/wolfdale.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Wolfdale (Core 2 Duo) 2M
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
diff --git a/tests/intel/core2/xeon-clovertown.test b/tests/intel/core2/xeon-clovertown.test
index f984574..fa57bdb 100644
--- a/tests/intel/core2/xeon-clovertown.test
+++ b/tests/intel/core2/xeon-clovertown.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 4096
 -1
+-1
 8
 16
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Xeon (Clovertown)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx tm2 ssse3 cx16 xtpr pdcm dca xd lm lahf_lm
diff --git a/tests/intel/core2/xeon-harpertown.test b/tests/intel/core2/xeon-harpertown.test
index be85a11..0f42ddc 100644
--- a/tests/intel/core2/xeon-harpertown.test
+++ b/tests/intel/core2/xeon-harpertown.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 6144
 -1
+-1
 8
 24
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Xeon (Harpertown)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 xd lm lahf_lm
diff --git a/tests/intel/core2/xeon-wolfdale.test b/tests/intel/core2/xeon-wolfdale.test
index 3d6c100..c1f8b2d 100644
--- a/tests/intel/core2/xeon-wolfdale.test
+++ b/tests/intel/core2/xeon-wolfdale.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 6144
 -1
+-1
 8
 24
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Xeon (Wolfdale)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
diff --git a/tests/intel/core2/yonah-2.test b/tests/intel/core2/yonah-2.test
index 8847be9..e59eca7 100644
--- a/tests/intel/core2/yonah-2.test
+++ b/tests/intel/core2/yonah-2.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Yonah (Core Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
diff --git a/tests/intel/core2/yonah-3.test b/tests/intel/core2/yonah-3.test
index 9d5e5dc..1533132 100644
--- a/tests/intel/core2/yonah-3.test
+++ b/tests/intel/core2/yonah-3.test
@@ -82,12 +82,15 @@ intel_fn11[3]=07280201 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Yonah (Core Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
diff --git a/tests/intel/core2/yonah.test b/tests/intel/core2/yonah.test
index 51e2f7b..3d6767b 100644
--- a/tests/intel/core2/yonah.test
+++ b/tests/intel/core2/yonah.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Yonah (Core Duo)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
diff --git a/tests/intel/core2/yorkfield-2m.test b/tests/intel/core2/yorkfield-2m.test
index 01c8f22..4dda4eb 100644
--- a/tests/intel/core2/yorkfield-2m.test
+++ b/tests/intel/core2/yorkfield-2m.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000000 00000000
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Yorkfield (Core 2 Quad) 2M
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd xsave osxsave lm lahf_lm
diff --git a/tests/intel/core2/yorkfield.test b/tests/intel/core2/yorkfield.test
index 33ffb03..da8be63 100644
--- a/tests/intel/core2/yorkfield.test
+++ b/tests/intel/core2/yorkfield.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 32
 6144
 -1
+-1
 8
 24
 -1
+-1
 64
 64
 -1
+-1
 128 (non-authoritative)
 Yorkfield (Core 2 Quad) 6M
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
diff --git a/tests/intel/haswell/haswell-i3.test b/tests/intel/haswell/haswell-i3.test
index ba14535..bc873de 100644
--- a/tests/intel/haswell/haswell-i3.test
+++ b/tests/intel/haswell/haswell-i3.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000001
 32
 256
 3072
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Haswell (Core i3)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc fma3 f16c rdrand avx2 bmi1 bmi2
diff --git a/tests/intel/haswell/haswell-i5.test b/tests/intel/haswell/haswell-i5.test
index 4b3fde2..680d859 100644
--- a/tests/intel/haswell/haswell-i5.test
+++ b/tests/intel/haswell/haswell-i5.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 3072
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Haswell (Core i5)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 syscall xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2
diff --git a/tests/intel/haswell/haswell-i7.test b/tests/intel/haswell/haswell-i7.test
index 8e2434b..8a91fb6 100644
--- a/tests/intel/haswell/haswell-i7.test
+++ b/tests/intel/haswell/haswell-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000003
 32
 256
 6144
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Haswell (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc fma3 f16c rdrand avx2 bmi1 bmi2
diff --git a/tests/intel/nehalem/arrandale-i5.test b/tests/intel/nehalem/arrandale-i5.test
index fd4ae9c..08ec017 100644
--- a/tests/intel/nehalem/arrandale-i5.test
+++ b/tests/intel/nehalem/arrandale-i5.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 3072
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Arrandale (Core i5)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/arrandale-i7.test b/tests/intel/nehalem/arrandale-i7.test
index e01114b..3c3f308 100644
--- a/tests/intel/nehalem/arrandale-i7.test
+++ b/tests/intel/nehalem/arrandale-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 4096
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Arrandale (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/arrandale-mobile.test b/tests/intel/nehalem/arrandale-mobile.test
index d013cc5..16ae5ab 100644
--- a/tests/intel/nehalem/arrandale-mobile.test
+++ b/tests/intel/nehalem/arrandale-mobile.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 3072
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Arrandale
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm xd popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/bloomfield.test b/tests/intel/nehalem/bloomfield.test
index 95ea90f..ea02c72 100644
--- a/tests/intel/nehalem/bloomfield.test
+++ b/tests/intel/nehalem/bloomfield.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000003
 32
 256
 8192
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Bloomfield (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/gulftown-i7.test b/tests/intel/nehalem/gulftown-i7.test
index 21ea4e9..085de17 100644
--- a/tests/intel/nehalem/gulftown-i7.test
+++ b/tests/intel/nehalem/gulftown-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 12288
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Gulftown (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/lynnfield-i7.test b/tests/intel/nehalem/lynnfield-i7.test
index 05b1cca..b0ce5be 100644
--- a/tests/intel/nehalem/lynnfield-i7.test
+++ b/tests/intel/nehalem/lynnfield-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 8192
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Lynnfield (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/xeon-bloomfield.test b/tests/intel/nehalem/xeon-bloomfield.test
index 23ccf19..e5c4e1c 100644
--- a/tests/intel/nehalem/xeon-bloomfield.test
+++ b/tests/intel/nehalem/xeon-bloomfield.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 8192
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Bloomfield (Xeon)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/xeon-gainestown.test b/tests/intel/nehalem/xeon-gainestown.test
index 29ac3c1..bd14987 100644
--- a/tests/intel/nehalem/xeon-gainestown.test
+++ b/tests/intel/nehalem/xeon-gainestown.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000001
 32
 256
 8192
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Gainestown 8M (Xeon)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/nehalem/xeon-gulftown.test b/tests/intel/nehalem/xeon-gulftown.test
index b59c0e1..fc95048 100644
--- a/tests/intel/nehalem/xeon-gulftown.test
+++ b/tests/intel/nehalem/xeon-gulftown.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 12288
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Gulftown (Xeon)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt aes rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/netburst/celeron-northwood.test.test b/tests/intel/netburst/celeron-northwood.test.test
index bff87da..fba386c 100644
--- a/tests/intel/netburst/celeron-northwood.test.test
+++ b/tests/intel/netburst/celeron-northwood.test.test
@@ -82,12 +82,15 @@ intel_fn11[3]=665b5101 00000000 00000000 003b7040
 12
 128
 0
+-1
 4
 2
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 P-4 Celeron (Northwood)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe cid xtpr
diff --git a/tests/intel/netburst/celeron-prescott.test b/tests/intel/netburst/celeron-prescott.test
index b10911b..f947fac 100644
--- a/tests/intel/netburst/celeron-prescott.test
+++ b/tests/intel/netburst/celeron-prescott.test
@@ -78,12 +78,15 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 -1
 256
 -1
+-1
 8
 4
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 P-4 Celeron D (Prescott)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe pni dts64 monitor ds_cpl cid xtpr
diff --git a/tests/intel/netburst/celeron-willamette.test b/tests/intel/netburst/celeron-willamette.test
index cbe40d8..d80608b 100644
--- a/tests/intel/netburst/celeron-willamette.test
+++ b/tests/intel/netburst/celeron-willamette.test
@@ -82,12 +82,15 @@ intel_fn11[3]=665b5001 00000000 00000000 00397040
 12
 128
 0
+-1
 4
 4
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 P-4 Celeron (Willamette)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm
diff --git a/tests/intel/netburst/mobile-p4-northwood.test b/tests/intel/netburst/mobile-p4-northwood.test
index a4adb69..ea1b8a2 100644
--- a/tests/intel/netburst/mobile-p4-northwood.test
+++ b/tests/intel/netburst/mobile-p4-northwood.test
@@ -78,12 +78,15 @@ intel_fn4[3]=665b5101 00000000 00000000 007b7040
 12
 512
 0
+-1
 4
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Mobile P-4 (Northwood)
 fpu vme de pse tsc msr pae mce cx8 mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe cid xtpr
diff --git a/tests/intel/netburst/p4-northwood.test b/tests/intel/netburst/p4-northwood.test
index 286ac88..19e9a9e 100644
--- a/tests/intel/netburst/p4-northwood.test
+++ b/tests/intel/netburst/p4-northwood.test
@@ -82,12 +82,15 @@ intel_fn11[3]=665b5101 00000000 00000000 007b7040
 12
 512
 0
+-1
 4
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Pentium 4 (Northwood)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss tm pbe cid xtpr
diff --git a/tests/intel/netburst/p4-prescott-ht.test b/tests/intel/netburst/p4-prescott-ht.test
index 17a78b4..8da417a 100644
--- a/tests/intel/netburst/p4-prescott-ht.test
+++ b/tests/intel/netburst/p4-prescott-ht.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000040 00000040 00000000 00000000
 -1
 1024
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Pentium 4 (Prescott)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl cid xtpr
diff --git a/tests/intel/netburst/xeon-prestonia.test b/tests/intel/netburst/xeon-prestonia.test
index 63ac72c..60a4673 100644
--- a/tests/intel/netburst/xeon-prestonia.test
+++ b/tests/intel/netburst/xeon-prestonia.test
@@ -78,12 +78,15 @@ intel_fn4[3]=665b5001 00000000 00000000 007b7040
 12
 512
 0
+-1
 4
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Xeon (Prestonia)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr
diff --git a/tests/intel/p2/pentium-coppermine.test b/tests/intel/p2/pentium-coppermine.test
index 3e66900..c5b2572 100644
--- a/tests/intel/p2/pentium-coppermine.test
+++ b/tests/intel/p2/pentium-coppermine.test
@@ -78,12 +78,15 @@ intel_fn4[3]=03020101 00000000 00000000 0c040882
 16
 256
 -1
+-1
 4
 8
 -1
+-1
 32
 32
 -1
+-1
 64 (non-authoritative)
 Pentium III (Coppermine)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 mmx fxsr sse
diff --git a/tests/intel/p2/pentium-dixon.test b/tests/intel/p2/pentium-dixon.test
index 9411d7b..64d84a6 100644
--- a/tests/intel/p2/pentium-dixon.test
+++ b/tests/intel/p2/pentium-dixon.test
@@ -78,12 +78,15 @@ intel_fn4[3]=03020101 00000000 00000000 0c040842
 16
 256
 -1
+-1
 4
 4
 -1
+-1
 32
 32
 -1
+-1
 -1 (non-authoritative)
 Pentium II (Dixon)
 fpu vme de pse tsc msr pae mce cx8 mtrr sep pge mca cmov pat pse36 mmx fxsr
diff --git a/tests/intel/p2/petium-m-dothan.test b/tests/intel/p2/petium-m-dothan.test
index d1e5b18..d48dc8d 100644
--- a/tests/intel/p2/petium-m-dothan.test
+++ b/tests/intel/p2/petium-m-dothan.test
@@ -78,12 +78,15 @@ intel_fn4[3]=02b3b001 000000f0 00000000 2c04307d
 32
 2048
 -1
+-1
 8
 8
 -1
+-1
 64
 64
 -1
+-1
 64 (non-authoritative)
 Pentium M (Dothan)
 fpu vme de pse tsc msr mce cx8 mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss tm pbe est tm2
diff --git a/tests/intel/sandy/celeron-sandy.test b/tests/intel/sandy/celeron-sandy.test
index 837e842..e846c3a 100644
--- a/tests/intel/sandy/celeron-sandy.test
+++ b/tests/intel/sandy/celeron-sandy.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 2048
+-1
 8
 8
 8
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Sandy Bridge (Celeron)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt xsave rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/sandy/ivy-bridge-i5.test b/tests/intel/sandy/ivy-bridge-i5.test
index 7a38402..f4b127c 100644
--- a/tests/intel/sandy/ivy-bridge-i5.test
+++ b/tests/intel/sandy/ivy-bridge-i5.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 6144
+-1
 8
 8
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Ivy Bridge (Core i5)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc f16c rdrand
diff --git a/tests/intel/sandy/sandy-bridge-e-i7.test b/tests/intel/sandy/sandy-bridge-e-i7.test
index 764d90b..3ea3bb2 100644
--- a/tests/intel/sandy/sandy-bridge-e-i7.test
+++ b/tests/intel/sandy/sandy-bridge-e-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 12288
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Sandy Bridge-E
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc x2apic
diff --git a/tests/intel/sandy/sandy-bridge-i7.test b/tests/intel/sandy/sandy-bridge-i7.test
index 80ecf19..9f5b4e6 100644
--- a/tests/intel/sandy/sandy-bridge-i7.test
+++ b/tests/intel/sandy/sandy-bridge-i7.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 8192
+-1
 8
 8
 16
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Sandy Bridge (Core i7)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc
diff --git a/tests/intel/sandy/xeon-sandy.test b/tests/intel/sandy/xeon-sandy.test
index 059826a..fde5fd4 100644
--- a/tests/intel/sandy/xeon-sandy.test
+++ b/tests/intel/sandy/xeon-sandy.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 20480
+-1
 8
 8
 20
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Sandy Bridge-E (Xeon)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 xd popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc x2apic
diff --git a/tests/intel/skylake/skylake-i5.test b/tests/intel/skylake/skylake-i5.test
index d3e4f91..d2bbdc4 100644
--- a/tests/intel/skylake/skylake-i5.test
+++ b/tests/intel/skylake/skylake-i5.test
@@ -82,12 +82,15 @@ intel_fn11[3]=00000000 00000000 00000003 00000000
 32
 256
 6144
+-1
 8
 4
 12
+-1
 64
 64
 64
+-1
 128 (non-authoritative)
 Skylake (Core i5)
 fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni pclmul dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 xd movbe popcnt aes xsave osxsave avx rdtscp lm lahf_lm constant_tsc fma3 f16c rdrand x2apic avx2 bmi1 bmi2 hle rtm
diff --git a/tests/run_tests.py b/tests/run_tests.py
index 460a7d2..5e5c97e 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -6,9 +6,10 @@ import os, sys, re, random
 
 ### Constants:
 fields = [ "family", "model", "stepping", "extfamily", "extmodel", "cores",
-           "logical", "l1d-cache", "l1i-cache", "l2-cache", "l3-cache",
-	   "l1d-assoc", "l2-assoc", "l3-assoc", "l1d-cacheline",
-	   "l2-cacheline", "l3-cacheline", "sse-size", "codename", "flags" ]
+	   "logical", "l1d-cache", "l1i-cache", "l2-cache", "l3-cache", "l4-cache",
+	   "l1d-assoc", "l2-assoc", "l3-assoc", "l4-assoc", "l1d-cacheline",
+	   "l2-cacheline", "l3-cacheline", "l4-cacheline", "sse-size",
+	   "codename", "flags" ]
 
 args = sys.argv
 fix = False