diff --git a/libcpuid/amd_code_t.h b/libcpuid/amd_code_t.h index d6d89f4..f100140 100644 --- a/libcpuid/amd_code_t.h +++ b/libcpuid/amd_code_t.h @@ -36,4 +36,4 @@ CODE(FUSION_EA), CODE(FUSION_Z), CODE(FUSION_A), - + CODE(FUSION_RX), diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index 7b0e2ff..115859c 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -250,6 +250,8 @@ const struct match_entry_t cpudb_amd[] = { { 15, 8, -1, 21, 56, 4, -1, -1, FUSION_A, 0 , 0, "Godavari X2" }, { 15, 8, -1, 21, 56, 4, -1, -1, FUSION_A, 0 , 0, "Godavari X4" }, { 15, 8, -1, 21, 56, 4, -1, -1, NC , ATHLON_|_X4 , 0, "Godavari X4" }, + { 15, 0, -1, 21, 48, 2, -1, -1, FUSION_RX, 0 , 0, "Bald Eagle X2" }, + { 15, 0, -1, 21, 48, 4, -1, -1, FUSION_RX, 0 , 0, "Bald Eagle X4" }, /* 4th-gen, Excavator core (2015): */ { 15, 1, -1, 21, 96, 2, -1, -1, FUSION_A, 0 , 0, "Carrizo X2" }, { 15, 1, -1, 21, 96, 4, -1, -1, FUSION_A, 0 , 0, "Carrizo X4" }, @@ -492,6 +494,7 @@ static struct amd_code_and_bits_t decode_amd_codename_part1(const char *bs) { FUSION_E, "E-###" }, { FUSION_Z, "Z-##" }, { FUSION_EA, "[EA]#-####" }, + { FUSION_RX, "RX-###" }, }; const struct { uint64_t bit; const char *search; } bit_matchtable[] = { diff --git a/tests/amd/bulldozer/bald-eagle-x4.test b/tests/amd/bulldozer/bald-eagle-x4.test new file mode 100644 index 0000000..4d77872 --- /dev/null +++ b/tests/amd/bulldozer/bald-eagle-x4.test @@ -0,0 +1,221 @@ +------[ CPUID Registers / Logical CPU #0 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 00000001: 00630F01-00040800-3E98320B-178BFBFF +CPUID 00000002: 00000000-00000000-00000000-00000000 +CPUID 00000003: 00000000-00000000-00000000-00000000 +CPUID 00000005: 00000040-00000040-00000003-00000000 +CPUID 00000006: 00000000-00000000-00000001-00000000 +CPUID 00000007: 00000000-00000009-00000000-00000000 +CPUID 00000008: 00000000-00000000-00000000-00000000 +CPUID 00000009: 00000000-00000000-00000000-00000000 +CPUID 0000000A: 00000000-00000000-00000000-00000000 +CPUID 0000000C: 00000000-00000000-00000000-00000000 +CPUID 0000000D: 00000007-00000340-000003C0-40000000 [SL 00] [x87] +CPUID 0000000D: 00000001-00000000-00000000-00000000 [SL 01] [SSE] +CPUID 0000000D: 00000100-00000240-00000000-00000000 [SL 02] [AVX] +CPUID 0000000D: 00000080-00000340-00000000-00000000 [SL 3E] +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 80000001: 00630F01-00000000-0FABBFFF-2FD3FBFF +CPUID 80000002: 20444D41-342D5852-42423732-74697720 [AMD RX-427BB wit] +CPUID 80000003: 4D412068-61522044-6E6F6564-296D7428 [h AMD Radeon(tm)] +CPUID 80000004: 20375220-70617247-73636968-00202020 [ R7 Graphics ] +CPUID 80000005: FF40FF18-FF40FF30-10040140-60030140 [L1D: 16 KB / L1I: 96 KB] +CPUID 80000006: 64006400-64004200-08008140-00000000 [L2: 2048 KB] / L3: 0 KB] +CPUID 80000007: 00000000-00000001-00000000-000027D9 +CPUID 80000008: 00003030-00000000-00004003-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-00001CFF +CPUID 8000000B: 00000000-00000000-00000000-00000000 +CPUID 8000000C: 00000000-00000000-00000000-00000000 +CPUID 8000000D: 00000000-00000000-00000000-00000000 +CPUID 8000000E: 00000000-00000000-00000000-00000000 +CPUID 8000000F: 00000000-00000000-00000000-00000000 +CPUID 80000010: 00000000-00000000-00000000-00000000 +CPUID 80000011: 00000000-00000000-00000000-00000000 +CPUID 80000012: 00000000-00000000-00000000-00000000 +CPUID 80000013: 00000000-00000000-00000000-00000000 +CPUID 80000014: 00000000-00000000-00000000-00000000 +CPUID 80000015: 00000000-00000000-00000000-00000000 +CPUID 80000016: 00000000-00000000-00000000-00000000 +CPUID 80000017: 00000000-00000000-00000000-00000000 +CPUID 80000018: 00000000-00000000-00000000-00000000 +CPUID 80000019: F040F018-64006400-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000001FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-E000000F +CPUID 8000001E: 00000010-00000100-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ CPUID Registers / Logical CPU #1 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 00000001: 00630F01-01040800-3E98320B-178BFBFF +CPUID 00000002: 00000000-00000000-00000000-00000000 +CPUID 00000003: 00000000-00000000-00000000-00000000 +CPUID 00000005: 00000040-00000040-00000003-00000000 +CPUID 00000006: 00000000-00000000-00000001-00000000 +CPUID 00000007: 00000000-00000009-00000000-00000000 +CPUID 00000008: 00000000-00000000-00000000-00000000 +CPUID 00000009: 00000000-00000000-00000000-00000000 +CPUID 0000000A: 00000000-00000000-00000000-00000000 +CPUID 0000000C: 00000000-00000000-00000000-00000000 +CPUID 0000000D: 00000007-00000340-000003C0-40000000 [SL 00] [x87] +CPUID 0000000D: 00000001-00000000-00000000-00000000 [SL 01] [SSE] +CPUID 0000000D: 00000100-00000240-00000000-00000000 [SL 02] [AVX] +CPUID 0000000D: 00000080-00000340-00000000-00000000 [SL 3E] +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 80000001: 00630F01-00000000-0FABBFFF-2FD3FBFF +CPUID 80000002: 20444D41-342D5852-42423732-74697720 [AMD RX-427BB wit] +CPUID 80000003: 4D412068-61522044-6E6F6564-296D7428 [h AMD Radeon(tm)] +CPUID 80000004: 20375220-70617247-73636968-00202020 [ R7 Graphics ] +CPUID 80000005: FF40FF18-FF40FF30-10040140-60030140 [L1D: 16 KB / L1I: 96 KB] +CPUID 80000006: 64006400-64004200-08008140-00000000 [L2: 2048 KB] / L3: 0 KB] +CPUID 80000007: 00000000-00000001-00000000-000027D9 +CPUID 80000008: 00003030-00000000-00004003-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-00001CFF +CPUID 8000000B: 00000000-00000000-00000000-00000000 +CPUID 8000000C: 00000000-00000000-00000000-00000000 +CPUID 8000000D: 00000000-00000000-00000000-00000000 +CPUID 8000000E: 00000000-00000000-00000000-00000000 +CPUID 8000000F: 00000000-00000000-00000000-00000000 +CPUID 80000010: 00000000-00000000-00000000-00000000 +CPUID 80000011: 00000000-00000000-00000000-00000000 +CPUID 80000012: 00000000-00000000-00000000-00000000 +CPUID 80000013: 00000000-00000000-00000000-00000000 +CPUID 80000014: 00000000-00000000-00000000-00000000 +CPUID 80000015: 00000000-00000000-00000000-00000000 +CPUID 80000016: 00000000-00000000-00000000-00000000 +CPUID 80000017: 00000000-00000000-00000000-00000000 +CPUID 80000018: 00000000-00000000-00000000-00000000 +CPUID 80000019: F040F018-64006400-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000001FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-E000000F +CPUID 8000001E: 00000011-00000100-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ CPUID Registers / Logical CPU #2 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 00000001: 00630F01-02040800-3E98320B-178BFBFF +CPUID 00000002: 00000000-00000000-00000000-00000000 +CPUID 00000003: 00000000-00000000-00000000-00000000 +CPUID 00000005: 00000040-00000040-00000003-00000000 +CPUID 00000006: 00000000-00000000-00000001-00000000 +CPUID 00000007: 00000000-00000009-00000000-00000000 +CPUID 00000008: 00000000-00000000-00000000-00000000 +CPUID 00000009: 00000000-00000000-00000000-00000000 +CPUID 0000000A: 00000000-00000000-00000000-00000000 +CPUID 0000000C: 00000000-00000000-00000000-00000000 +CPUID 0000000D: 00000007-00000340-000003C0-40000000 [SL 00] [x87] +CPUID 0000000D: 00000001-00000000-00000000-00000000 [SL 01] [SSE] +CPUID 0000000D: 00000100-00000240-00000000-00000000 [SL 02] [AVX] +CPUID 0000000D: 00000080-00000340-00000000-00000000 [SL 3E] +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 80000001: 00630F01-00000000-0FABBFFF-2FD3FBFF +CPUID 80000002: 20444D41-342D5852-42423732-74697720 [AMD RX-427BB wit] +CPUID 80000003: 4D412068-61522044-6E6F6564-296D7428 [h AMD Radeon(tm)] +CPUID 80000004: 20375220-70617247-73636968-00202020 [ R7 Graphics ] +CPUID 80000005: FF40FF18-FF40FF30-10040140-60030140 [L1D: 16 KB / L1I: 96 KB] +CPUID 80000006: 64006400-64004200-08008140-00000000 [L2: 2048 KB] / L3: 0 KB] +CPUID 80000007: 00000000-00000001-00000000-000027D9 +CPUID 80000008: 00003030-00000000-00004003-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-00001CFF +CPUID 8000000B: 00000000-00000000-00000000-00000000 +CPUID 8000000C: 00000000-00000000-00000000-00000000 +CPUID 8000000D: 00000000-00000000-00000000-00000000 +CPUID 8000000E: 00000000-00000000-00000000-00000000 +CPUID 8000000F: 00000000-00000000-00000000-00000000 +CPUID 80000010: 00000000-00000000-00000000-00000000 +CPUID 80000011: 00000000-00000000-00000000-00000000 +CPUID 80000012: 00000000-00000000-00000000-00000000 +CPUID 80000013: 00000000-00000000-00000000-00000000 +CPUID 80000014: 00000000-00000000-00000000-00000000 +CPUID 80000015: 00000000-00000000-00000000-00000000 +CPUID 80000016: 00000000-00000000-00000000-00000000 +CPUID 80000017: 00000000-00000000-00000000-00000000 +CPUID 80000018: 00000000-00000000-00000000-00000000 +CPUID 80000019: F040F018-64006400-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000001FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-E000000F +CPUID 8000001E: 00000012-00000101-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ CPUID Registers / Logical CPU #3 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 00000001: 00630F01-03040800-3E98320B-178BFBFF +CPUID 00000002: 00000000-00000000-00000000-00000000 +CPUID 00000003: 00000000-00000000-00000000-00000000 +CPUID 00000005: 00000040-00000040-00000003-00000000 +CPUID 00000006: 00000000-00000000-00000001-00000000 +CPUID 00000007: 00000000-00000009-00000000-00000000 +CPUID 00000008: 00000000-00000000-00000000-00000000 +CPUID 00000009: 00000000-00000000-00000000-00000000 +CPUID 0000000A: 00000000-00000000-00000000-00000000 +CPUID 0000000C: 00000000-00000000-00000000-00000000 +CPUID 0000000D: 00000007-00000340-000003C0-40000000 [SL 00] [x87] +CPUID 0000000D: 00000001-00000000-00000000-00000000 [SL 01] [SSE] +CPUID 0000000D: 00000100-00000240-00000000-00000000 [SL 02] [AVX] +CPUID 0000000D: 00000080-00000340-00000000-00000000 [SL 3E] +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 [AuthenticAMD] +CPUID 80000001: 00630F01-00000000-0FABBFFF-2FD3FBFF +CPUID 80000002: 20444D41-342D5852-42423732-74697720 [AMD RX-427BB wit] +CPUID 80000003: 4D412068-61522044-6E6F6564-296D7428 [h AMD Radeon(tm)] +CPUID 80000004: 20375220-70617247-73636968-00202020 [ R7 Graphics ] +CPUID 80000005: FF40FF18-FF40FF30-10040140-60030140 [L1D: 16 KB / L1I: 96 KB] +CPUID 80000006: 64006400-64004200-08008140-00000000 [L2: 2048 KB] / L3: 0 KB] +CPUID 80000007: 00000000-00000001-00000000-000027D9 +CPUID 80000008: 00003030-00000000-00004003-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-00001CFF +CPUID 8000000B: 00000000-00000000-00000000-00000000 +CPUID 8000000C: 00000000-00000000-00000000-00000000 +CPUID 8000000D: 00000000-00000000-00000000-00000000 +CPUID 8000000E: 00000000-00000000-00000000-00000000 +CPUID 8000000F: 00000000-00000000-00000000-00000000 +CPUID 80000010: 00000000-00000000-00000000-00000000 +CPUID 80000011: 00000000-00000000-00000000-00000000 +CPUID 80000012: 00000000-00000000-00000000-00000000 +CPUID 80000013: 00000000-00000000-00000000-00000000 +CPUID 80000014: 00000000-00000000-00000000-00000000 +CPUID 80000015: 00000000-00000000-00000000-00000000 +CPUID 80000016: 00000000-00000000-00000000-00000000 +CPUID 80000017: 00000000-00000000-00000000-00000000 +CPUID 80000018: 00000000-00000000-00000000-00000000 +CPUID 80000019: F040F018-64006400-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000001FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-E000000F +CPUID 8000001E: 00000013-00000101-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +-------------------------------------------------------------------------------- +x86 +general +15 +0 +1 +21 +48 +4 +4 +16 +96 +2048 +-1 +-1 +4 +3 +16 +-1 +-1 +64 +64 +64 +-1 +-1 +-1 +-1 +-1 +-1 +-1 +128 (authoritative) +Bald Eagle 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