DBC: Enable CpuInfo test

[email protected]

Review URL: https://codereview.chromium.org/1928473003 .

Author: zanderso

runtime/vm/cpu_dbc.cc

@@ -6,11 +6,12 @@
 #if defined(TARGET_ARCH_DBC)
 
 #include "vm/cpu.h"
+#include "vm/cpu_dbc.h"
 
+#include "vm/cpuinfo.h"
 
 namespace dart {
 
-
 void CPU::FlushICache(uword start, uword size) {
   // Nothing to do.
 }
@@ -21,6 +22,31 @@ const char* CPU::Id() {
 }
 
 
+const char* HostCPUFeatures::hardware_ = NULL;
+#if defined(DEBUG)
+bool HostCPUFeatures::initialized_ = false;
+#endif
+
+void HostCPUFeatures::InitOnce() {
+  CpuInfo::InitOnce();
+  hardware_ = CpuInfo::GetCpuModel();
+#if defined(DEBUG)
+  initialized_ = true;
+#endif
+}
+
+
+void HostCPUFeatures::Cleanup() {
+  DEBUG_ASSERT(initialized_);
+#if defined(DEBUG)
+  initialized_ = false;
+#endif
+  ASSERT(hardware_ != NULL);
+  free(const_cast<char*>(hardware_));
+  hardware_ = NULL;
+  CpuInfo::Cleanup();
+}
+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_DBC

runtime/vm/cpu_dbc.h

@@ -12,13 +12,33 @@ namespace dart {
 
 class HostCPUFeatures: public AllStatic {
  public:
-  static const char* hardware() { return "simdbc"; }
+  static void InitOnce();
+  static void Cleanup();
+
+  static const char* hardware() {
+    DEBUG_ASSERT(initialized_);
+    return hardware_;
+  }
+
+ private:
+  static const char* hardware_;
+#if defined(DEBUG)
+  static bool initialized_;
+#endif
 };
 
 class TargetCPUFeatures : public AllStatic {
  public:
-  static void InitOnce() {}
-  static void Cleanup() {}
+  static void InitOnce() {
+    HostCPUFeatures::InitOnce();
+  }
+  static void Cleanup() {
+    HostCPUFeatures::Cleanup();
+  }
+
+  static const char* hardware() {
+    return CPU::Id();
+  }
 
   static bool double_truncate_round_supported() {
     return true;

runtime/vm/cpuinfo_test.cc

@@ -9,13 +9,11 @@
 
 namespace dart {
 
-#if !defined(TARGET_ARCH_DBC)
 UNIT_TEST_CASE(GetCpuModelTest) {
   const char* cpumodel = CpuInfo::GetCpuModel();
   EXPECT_NE(strlen(cpumodel), 0UL);
   // caller is responsible for deleting the returned cpumodel string.
   free(const_cast<char*>(cpumodel));
 }
-#endif
 
 }  // namespace dart