From ee97ed213aaf37cee07b0c3884841169edb38124 Mon Sep 17 00:00:00 2001 From: Xorg Date: Thu, 22 Sep 2022 20:17:33 +0200 Subject: [PATCH] DB: rename AMD Bulldozer to Zambezi --- libcpuid/recog_amd.c | 8 +- tests/amd/bulldozer/zambezi-x3.test | 327 ++++++++++++++++++ .../{bulldozer-x4.test => zambezi-x4.test} | 2 +- 3 files changed, 332 insertions(+), 5 deletions(-) create mode 100644 tests/amd/bulldozer/zambezi-x3.test rename tests/amd/bulldozer/{bulldozer-x4.test => zambezi-x4.test} (99%) diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index 04e795e..7f49e30 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -232,10 +232,10 @@ const struct match_entry_t cpudb_amd[] = { { 15, 2, -1, 20, -1, 2, -1, -1, FUSION_Z, 0 , 0, "Brazos Desna (Dual-core)" }, /* Family 15h: Bulldozer Architecture (2011) */ - { 15, -1, -1, 21, 0, 4, -1, -1, NC, 0 , 0, "Bulldozer X2" }, - { 15, -1, -1, 21, 1, 4, -1, -1, NC, 0 , 0, "Bulldozer X2" }, - { 15, -1, -1, 21, 1, 6, -1, -1, NC, 0 , 0, "Bulldozer X3" }, - { 15, -1, -1, 21, 1, 8, -1, -1, NC, 0 , 0, "Bulldozer X4" }, + { 15, -1, -1, 21, 0, 4, -1, -1, NC, 0 , 0, "Zambezi X2" }, + { 15, -1, -1, 21, 1, 4, -1, -1, NC, 0 , 0, "Zambezi X2" }, + { 15, -1, -1, 21, 1, 6, -1, -1, NC, 0 , 0, "Zambezi X3" }, + { 15, -1, -1, 21, 1, 8, -1, -1, NC, 0 , 0, "Zambezi X4" }, /* 2nd-gen, Piledriver core (2012): */ { 15, -1, -1, 21, 2, 4, -1, -1, NC, 0 , 0, "Vishera X2" }, { 15, -1, -1, 21, 2, 6, -1, -1, NC, 0 , 0, "Vishera X3" }, diff --git a/tests/amd/bulldozer/zambezi-x3.test b/tests/amd/bulldozer/zambezi-x3.test new file mode 100644 index 0000000..c5432dd --- /dev/null +++ b/tests/amd/bulldozer/zambezi-x3.test @@ -0,0 +1,327 @@ +------[ Logical CPU #0 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-00060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000010-00000100-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ Logical CPU #1 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-01060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000011-00000100-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ Logical CPU #2 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-02060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000012-00000101-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ Logical CPU #3 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-03060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000013-00000101-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ Logical CPU #4 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-04060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000014-00000102-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +------[ Logical CPU #5 ]------ +CPUID 00000000: 0000000D-68747541-444D4163-69746E65 +CPUID 00000001: 00600F12-05060800-1E98220B-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-00000000-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 +CPUID 0000000D: 00000100-00000240-00000000-00000000 +CPUID 80000000: 8000001E-68747541-444D4163-69746E65 +CPUID 80000001: 00600F12-10000000-01C9BFFF-2FD3FBFF +CPUID 80000002: 20444D41-74285846-362D296D-20303031 +CPUID 80000003: 2D786953-65726F43-6F725020-73736563 +CPUID 80000004: 2020726F-20202020-20202020-00202020 +CPUID 80000005: FF20FF18-FF20FF30-10040140-40020140 +CPUID 80000006: 64000000-64004200-08008140-0040C140 +CPUID 80000007: 00000000-00000000-00000000-000003D9 +CPUID 80000008: 00003030-00000000-00004005-00000000 +CPUID 80000009: 00000000-00000000-00000000-00000000 +CPUID 8000000A: 00000001-00010000-00000000-000014FF +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: F020F018-64000000-00000000-00000000 +CPUID 8000001A: 00000003-00000000-00000000-00000000 +CPUID 8000001B: 000000FF-00000000-00000000-00000000 +CPUID 8000001C: 00000000-80032013-00010200-8000000F +CPUID 8000001D: 00000121-00C0003F-0000003F-00000000 +CPUID 8000001D: 00004122-0040003F-000001FF-00000000 +CPUID 8000001D: 00004143-03C0003F-000007FF-00000001 +CPUID 8000001D: 00014163-0FC0003F-000007FF-00000001 +CPUID 8000001E: 00000015-00000102-00000000-00000000 +CPUID 8FFFFFFF: 00000000-00000000-00000000-00000000 +-------------------------------------------------------------------------------- +x86 +general +15 +1 +2 +21 +1 +6 +6 +16 +64 +2048 +8192 +-1 +4 +2 +16 +64 +-1 +64 +64 +64 +64 +-1 +-1 +-1 +-1 +-1 +-1 +128 (authoritative) +Zambezi X3 +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/bulldozer-x4.test b/tests/amd/bulldozer/zambezi-x4.test similarity index 99% rename from tests/amd/bulldozer/bulldozer-x4.test rename to tests/amd/bulldozer/zambezi-x4.test index 16713cb..24182c9 100644 --- a/tests/amd/bulldozer/bulldozer-x4.test +++ b/tests/amd/bulldozer/zambezi-x4.test @@ -101,5 +101,5 @@ general -1 -1 128 (authoritative) -Bulldozer X4 +Zambezi 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