Add 2 Intel P4 tests / Rename some tests/codenames

Rename some codenames to keep things tidy

libcpuid/recog_intel.c

@@ -160,9 +160,9 @@ const struct match_entry_t cpudb_intel[] = {
 	{  6, 11, -1, -1, -1,   1,    -1,    -1, XEON              ,     0, "P-III Xeon (Tualatin)"   },
 	
 	{  6,  7, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Katmai)"     },
-	{  6,  8, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Coppermine-128)" },
+	{  6,  8, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Coppermine)" },
-	{  6, 10, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Coppermine-128)" },
+	{  6, 10, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Coppermine)" },
-	{  6, 11, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Tualatin-256)"   },
+	{  6, 11, -1, -1, -1,   1,    -1,    -1, CELERON           ,     0, "P-III Celeron (Tualatin)"   },
 	
 	/* Netburst based (Pentium 4 and later)
 	   classic P4s */
@@ -202,11 +202,11 @@ const struct match_entry_t cpudb_intel[] = {
 	{ 15,  6, -1, 15, -1,   1,    -1,    -1, PENTIUM_D         ,     0, "Pentium D (Presler)"     },
 
 	/* Celeron and Celeron Ds */
-	{ 15,  1, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron (Willamette-128)"   },
+	{ 15,  1, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron (Willamette)"   },
-	{ 15,  2, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron (Northwood-128)"    },
+	{ 15,  2, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron (Northwood)"    },
-	{ 15,  3, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Prescott-256)"   },
+	{ 15,  3, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Prescott)"   },
-	{ 15,  4, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Prescott-256)"   },
+	{ 15,  4, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Prescott)"   },
-	{ 15,  6, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Cedar Mill-512)" },
+	{ 15,  6, -1, 15, -1,   1,    -1,    -1, CELERON           ,     0, "P-4 Celeron D (Cedar Mill)" },
 	
 	/* -------------------------------------------------- */
 	/* Intel Core microarchitecture - P6-based */

tests/intel/netburst/celeron-northwood.test.test

@@ -0,0 +1,93 @@
+basic_cpuid[0]=00000002 756e6547 6c65746e 49656e69
+basic_cpuid[1]=00000f29 0001080a 00004400 bfebfbff
+basic_cpuid[2]=665b5101 00000000 00000000 003b7040
+basic_cpuid[3]=665b5101 00000000 00000000 003b7040
+basic_cpuid[4]=665b5101 00000000 00000000 003b7040
+basic_cpuid[5]=665b5101 00000000 00000000 003b7040
+basic_cpuid[6]=665b5101 00000000 00000000 003b7040
+basic_cpuid[7]=665b5101 00000000 00000000 003b7040
+basic_cpuid[8]=665b5101 00000000 00000000 003b7040
+basic_cpuid[9]=665b5101 00000000 00000000 003b7040
+basic_cpuid[10]=665b5101 00000000 00000000 003b7040
+basic_cpuid[11]=665b5101 00000000 00000000 003b7040
+basic_cpuid[12]=665b5101 00000000 00000000 003b7040
+basic_cpuid[13]=665b5101 00000000 00000000 003b7040
+basic_cpuid[14]=665b5101 00000000 00000000 003b7040
+basic_cpuid[15]=665b5101 00000000 00000000 003b7040
+basic_cpuid[16]=665b5101 00000000 00000000 003b7040
+basic_cpuid[17]=665b5101 00000000 00000000 003b7040
+basic_cpuid[18]=665b5101 00000000 00000000 003b7040
+basic_cpuid[19]=665b5101 00000000 00000000 003b7040
+basic_cpuid[20]=665b5101 00000000 00000000 003b7040
+basic_cpuid[21]=665b5101 00000000 00000000 003b7040
+basic_cpuid[22]=665b5101 00000000 00000000 003b7040
+basic_cpuid[23]=665b5101 00000000 00000000 003b7040
+basic_cpuid[24]=665b5101 00000000 00000000 003b7040
+basic_cpuid[25]=665b5101 00000000 00000000 003b7040
+basic_cpuid[26]=665b5101 00000000 00000000 003b7040
+basic_cpuid[27]=665b5101 00000000 00000000 003b7040
+basic_cpuid[28]=665b5101 00000000 00000000 003b7040
+basic_cpuid[29]=665b5101 00000000 00000000 003b7040
+basic_cpuid[30]=665b5101 00000000 00000000 003b7040
+basic_cpuid[31]=665b5101 00000000 00000000 003b7040
+ext_cpuid[0]=80000004 00000000 00000000 00000000
+ext_cpuid[1]=00000000 00000000 00000000 00000000
+ext_cpuid[2]=20202020 20202020 20202020 20202020
+ext_cpuid[3]=65746e49 2952286c 6c654320 6e6f7265
+ext_cpuid[4]=20295228 20555043 30352e32 007a4847
+ext_cpuid[5]=665b5101 00000000 00000000 003b7040
+ext_cpuid[6]=665b5101 00000000 00000000 003b7040
+ext_cpuid[7]=665b5101 00000000 00000000 003b7040
+ext_cpuid[8]=665b5101 00000000 00000000 003b7040
+ext_cpuid[9]=665b5101 00000000 00000000 003b7040
+ext_cpuid[10]=665b5101 00000000 00000000 003b7040
+ext_cpuid[11]=665b5101 00000000 00000000 003b7040
+ext_cpuid[12]=665b5101 00000000 00000000 003b7040
+ext_cpuid[13]=665b5101 00000000 00000000 003b7040
+ext_cpuid[14]=665b5101 00000000 00000000 003b7040
+ext_cpuid[15]=665b5101 00000000 00000000 003b7040
+ext_cpuid[16]=665b5101 00000000 00000000 003b7040
+ext_cpuid[17]=665b5101 00000000 00000000 003b7040
+ext_cpuid[18]=665b5101 00000000 00000000 003b7040
+ext_cpuid[19]=665b5101 00000000 00000000 003b7040
+ext_cpuid[20]=665b5101 00000000 00000000 003b7040
+ext_cpuid[21]=665b5101 00000000 00000000 003b7040
+ext_cpuid[22]=665b5101 00000000 00000000 003b7040
+ext_cpuid[23]=665b5101 00000000 00000000 003b7040
+ext_cpuid[24]=665b5101 00000000 00000000 003b7040
+ext_cpuid[25]=665b5101 00000000 00000000 003b7040
+ext_cpuid[26]=665b5101 00000000 00000000 003b7040
+ext_cpuid[27]=665b5101 00000000 00000000 003b7040
+ext_cpuid[28]=665b5101 00000000 00000000 003b7040
+ext_cpuid[29]=665b5101 00000000 00000000 003b7040
+ext_cpuid[30]=665b5101 00000000 00000000 003b7040
+ext_cpuid[31]=665b5101 00000000 00000000 003b7040
+intel_fn4[0]=665b5101 00000000 00000000 003b7040
+intel_fn4[1]=665b5101 00000000 00000000 003b7040
+intel_fn4[2]=665b5101 00000000 00000000 003b7040
+intel_fn4[3]=665b5101 00000000 00000000 003b7040
+intel_fn11[0]=665b5101 00000000 00000000 003b7040
+intel_fn11[1]=665b5101 00000000 00000000 003b7040
+intel_fn11[2]=665b5101 00000000 00000000 003b7040
+intel_fn11[3]=665b5101 00000000 00000000 003b7040
+--------------------------------------------------------------------------------
+15
+2
+9
+15
+2
+1
+1
+8
+12
+128
+0
+4
+2
+-1
+64
+64
+-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

tests/intel/netburst/celeron-prescott.test

@@ -85,5 +85,5 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
 64
 -1
 64 (non-authoritative)
-P-4 Celeron D (Prescott-256)
+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

tests/intel/netburst/celeron-willamette.test

@@ -89,5 +89,5 @@ intel_fn11[3]=665b5001 00000000 00000000 00397040
 64
 -1
 64 (non-authoritative)
-P-4 Celeron (Willamette-128)
+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

tests/intel/netburst/p4-northwood.test

@@ -0,0 +1,93 @@
+basic_cpuid[0]=00000002 756e6547 6c65746e 49656e69
+basic_cpuid[1]=00000f29 00010809 00004400 bfebfbff
+basic_cpuid[2]=665b5101 00000000 00000000 007b7040
+basic_cpuid[3]=665b5101 00000000 00000000 007b7040
+basic_cpuid[4]=665b5101 00000000 00000000 007b7040
+basic_cpuid[5]=665b5101 00000000 00000000 007b7040
+basic_cpuid[6]=665b5101 00000000 00000000 007b7040
+basic_cpuid[7]=665b5101 00000000 00000000 007b7040
+basic_cpuid[8]=665b5101 00000000 00000000 007b7040
+basic_cpuid[9]=665b5101 00000000 00000000 007b7040
+basic_cpuid[10]=665b5101 00000000 00000000 007b7040
+basic_cpuid[11]=665b5101 00000000 00000000 007b7040
+basic_cpuid[12]=665b5101 00000000 00000000 007b7040
+basic_cpuid[13]=665b5101 00000000 00000000 007b7040
+basic_cpuid[14]=665b5101 00000000 00000000 007b7040
+basic_cpuid[15]=665b5101 00000000 00000000 007b7040
+basic_cpuid[16]=665b5101 00000000 00000000 007b7040
+basic_cpuid[17]=665b5101 00000000 00000000 007b7040
+basic_cpuid[18]=665b5101 00000000 00000000 007b7040
+basic_cpuid[19]=665b5101 00000000 00000000 007b7040
+basic_cpuid[20]=665b5101 00000000 00000000 007b7040
+basic_cpuid[21]=665b5101 00000000 00000000 007b7040
+basic_cpuid[22]=665b5101 00000000 00000000 007b7040
+basic_cpuid[23]=665b5101 00000000 00000000 007b7040
+basic_cpuid[24]=665b5101 00000000 00000000 007b7040
+basic_cpuid[25]=665b5101 00000000 00000000 007b7040
+basic_cpuid[26]=665b5101 00000000 00000000 007b7040
+basic_cpuid[27]=665b5101 00000000 00000000 007b7040
+basic_cpuid[28]=665b5101 00000000 00000000 007b7040
+basic_cpuid[29]=665b5101 00000000 00000000 007b7040
+basic_cpuid[30]=665b5101 00000000 00000000 007b7040
+basic_cpuid[31]=665b5101 00000000 00000000 007b7040
+ext_cpuid[0]=80000004 00000000 00000000 00000000
+ext_cpuid[1]=00000000 00000000 00000000 00000000
+ext_cpuid[2]=20202020 20202020 20202020 6e492020
+ext_cpuid[3]=286c6574 50202952 69746e65 52286d75
+ext_cpuid[4]=20342029 20555043 36362e32 007a4847
+ext_cpuid[5]=665b5101 00000000 00000000 007b7040
+ext_cpuid[6]=665b5101 00000000 00000000 007b7040
+ext_cpuid[7]=665b5101 00000000 00000000 007b7040
+ext_cpuid[8]=665b5101 00000000 00000000 007b7040
+ext_cpuid[9]=665b5101 00000000 00000000 007b7040
+ext_cpuid[10]=665b5101 00000000 00000000 007b7040
+ext_cpuid[11]=665b5101 00000000 00000000 007b7040
+ext_cpuid[12]=665b5101 00000000 00000000 007b7040
+ext_cpuid[13]=665b5101 00000000 00000000 007b7040
+ext_cpuid[14]=665b5101 00000000 00000000 007b7040
+ext_cpuid[15]=665b5101 00000000 00000000 007b7040
+ext_cpuid[16]=665b5101 00000000 00000000 007b7040
+ext_cpuid[17]=665b5101 00000000 00000000 007b7040
+ext_cpuid[18]=665b5101 00000000 00000000 007b7040
+ext_cpuid[19]=665b5101 00000000 00000000 007b7040
+ext_cpuid[20]=665b5101 00000000 00000000 007b7040
+ext_cpuid[21]=665b5101 00000000 00000000 007b7040
+ext_cpuid[22]=665b5101 00000000 00000000 007b7040
+ext_cpuid[23]=665b5101 00000000 00000000 007b7040
+ext_cpuid[24]=665b5101 00000000 00000000 007b7040
+ext_cpuid[25]=665b5101 00000000 00000000 007b7040
+ext_cpuid[26]=665b5101 00000000 00000000 007b7040
+ext_cpuid[27]=665b5101 00000000 00000000 007b7040
+ext_cpuid[28]=665b5101 00000000 00000000 007b7040
+ext_cpuid[29]=665b5101 00000000 00000000 007b7040
+ext_cpuid[30]=665b5101 00000000 00000000 007b7040
+ext_cpuid[31]=665b5101 00000000 00000000 007b7040
+intel_fn4[0]=665b5101 00000000 00000000 007b7040
+intel_fn4[1]=665b5101 00000000 00000000 007b7040
+intel_fn4[2]=665b5101 00000000 00000000 007b7040
+intel_fn4[3]=665b5101 00000000 00000000 007b7040
+intel_fn11[0]=665b5101 00000000 00000000 007b7040
+intel_fn11[1]=665b5101 00000000 00000000 007b7040
+intel_fn11[2]=665b5101 00000000 00000000 007b7040
+intel_fn11[3]=665b5101 00000000 00000000 007b7040
+--------------------------------------------------------------------------------
+15
+2
+9
+15
+2
+1
+1
+8
+12
+512
+0
+4
+8
+-1
+64
+64
+-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