[x86] Embed brand_string and mark FillX86BrandString as deprecated (#214)

1 files changed, 26 insertions, 0 deletions

diff --git a/test/cpuinfo_x86_test.cc b/test/cpuinfo_x86_test.cc
index 889190e..0972c08 100644
--- a/test/cpuinfo_x86_test.cc
+++ b/test/cpuinfo_x86_test.cc
@@ -414,6 +414,8 @@ TEST_F(CpuidX86Test, AMD_K15_EXCAVATOR_STONEY_RIDGE) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x15);
   EXPECT_EQ(info.model, 0x70);
+  EXPECT_STREQ(info.brand_string,
+               "AMD A9-9410 RADEON R5, 5 COMPUTE CORES 2C+3G   ");
   EXPECT_EQ(GetX86Microarchitecture(&info),
             X86Microarchitecture::AMD_EXCAVATOR);
 
@@ -439,6 +441,8 @@ TEST_F(CpuidX86Test, AMD_K15_PILEDRIVER_ABU_DHABI) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x15);
   EXPECT_EQ(info.model, 0x02);
+  EXPECT_STREQ(info.brand_string,
+               "AMD Opteron(tm) Processor 6376                 ");
   EXPECT_EQ(GetX86Microarchitecture(&info),
             X86Microarchitecture::AMD_PILEDRIVER);
 
@@ -512,6 +516,8 @@ TEST_F(CpuidX86Test, AMD_K15_BULLDOZER_INTERLAGOS) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x15);
   EXPECT_EQ(info.model, 0x01);
+  EXPECT_STREQ(info.brand_string,
+               "AMD Opteron(TM) Processor 6238                 ");
   EXPECT_EQ(GetX86Microarchitecture(&info),
             X86Microarchitecture::AMD_BULLDOZER);
 
@@ -539,6 +545,8 @@ TEST_F(CpuidX86Test, AMD_K15_STREAMROLLER_GODAVARI) {
   EXPECT_EQ(info.family, 0x15);
   EXPECT_EQ(info.model, 0x38);
   EXPECT_EQ(info.stepping, 0x01);
+  EXPECT_STREQ(info.brand_string,
+               "AMD A8-7670K Radeon R7, 10 Compute Cores 4C+6G ");
   EXPECT_EQ(GetX86Microarchitecture(&info),
             X86Microarchitecture::AMD_STREAMROLLER);
 
@@ -564,6 +572,8 @@ TEST_F(CpuidX86Test, AMD_K16_JAGUAR_KABINI) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x16);
   EXPECT_EQ(info.model, 0x00);
+  EXPECT_STREQ(info.brand_string,
+               "AMD A4-5000 APU with Radeon(TM) HD Graphics    ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_JAGUAR);
 
   char brand_string[49];
@@ -588,6 +598,8 @@ TEST_F(CpuidX86Test, AMD_K16_PUMA_BEEMA) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x16);
   EXPECT_EQ(info.model, 0x30);
+  EXPECT_STREQ(info.brand_string,
+               "AMD A6-6310 APU with AMD Radeon R4 Graphics    ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_PUMA);
 
   char brand_string[49];
@@ -612,6 +624,8 @@ TEST_F(CpuidX86Test, AMD_K17_ZEN_DALI) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x17);
   EXPECT_EQ(info.model, 0x20);
+  EXPECT_STREQ(info.brand_string,
+               "AMD 3020e with Radeon Graphics                 ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN);
 
   char brand_string[49];
@@ -636,6 +650,8 @@ TEST_F(CpuidX86Test, AMD_K17_ZEN_PLUS_PINNACLE_RIDGE) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x17);
   EXPECT_EQ(info.model, 0x08);
+  EXPECT_STREQ(info.brand_string,
+               "AMD Ryzen 7 2700X Eight-Core Processor         ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN_PLUS);
 
   char brand_string[49];
@@ -660,6 +676,7 @@ TEST_F(CpuidX86Test, AMD_K17_ZEN2_XBOX_SERIES_X) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x17);
   EXPECT_EQ(info.model, 0x47);
+  EXPECT_STREQ(info.brand_string, "AMD 4700S 8-Core Processor Desktop Kit");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN2);
 
   char brand_string[49];
@@ -684,6 +701,8 @@ TEST_F(CpuidX86Test, AMD_K18_ZEN_DHYANA) {
   EXPECT_STREQ(info.vendor, "HygonGenuine");
   EXPECT_EQ(info.family, 0x18);
   EXPECT_EQ(info.model, 0x00);
+  EXPECT_STREQ(info.brand_string,
+               "Hygon C86 3185  8-core Processor               ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN);
 
   char brand_string[49];
@@ -756,6 +775,8 @@ TEST_F(CpuidX86Test, AMD_K19_ZEN3_VERMEER) {
   EXPECT_STREQ(info.vendor, "AuthenticAMD");
   EXPECT_EQ(info.family, 0x19);
   EXPECT_EQ(info.model, 0x21);
+  EXPECT_STREQ(info.brand_string,
+               "AMD Ryzen 9 5900X 12-Core Processor            ");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN3);
 
   char brand_string[49];
@@ -827,6 +848,8 @@ flags           : fpu mmx sse sse2 sse3 ssse3 sse4_1 sse4_2
   EXPECT_EQ(info.family, 0x06);
   EXPECT_EQ(info.model, 0x1A);
   EXPECT_EQ(info.stepping, 0x02);
+  EXPECT_STREQ(info.brand_string,
+               "Genuine Intel(R) CPU           @ 0000 @ 1.87GHz");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::INTEL_NHM);
 
   char brand_string[49];
@@ -908,6 +931,8 @@ flags           : fpu mmx sse sse2 sse3 ssse3 sse4_1 sse4_2
   EXPECT_EQ(info.family, 0x06);
   EXPECT_EQ(info.model, 0x37);
   EXPECT_EQ(info.stepping, 0x03);
+  EXPECT_STREQ(info.brand_string,
+               "      Intel(R) Celeron(R) CPU  J1900  @ 1.99GHz");
   EXPECT_EQ(GetX86Microarchitecture(&info),
             X86Microarchitecture::INTEL_ATOM_SMT);
 
@@ -1014,6 +1039,7 @@ flags           : fpu mmx sse
   EXPECT_EQ(info.family, 0x06);
   EXPECT_EQ(info.model, 0x07);
   EXPECT_EQ(info.stepping, 0x03);
+  EXPECT_STREQ(info.brand_string, "");
   EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::X86_UNKNOWN);
 
   char brand_string[49];