[llvm-branch-commits] [llvm-branch] r314437 - Merging r313998:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Sep 28 10:52:12 2017
New Revision: 314437

URL: http://llvm.org/viewvc/llvm-project?rev=314437&view=rev
Log:
Merging r313998:

------------------------------------------------------------------------
r313998 | bmakam | 2017-09-22 10:46:36 -0700 (Fri, 22 Sep 2017) | 3 lines

    [Falkor] Add falkor CPU to host detection

    This returns "falkor" for Falkor CPU.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/lib/Support/Host.cpp
    llvm/branches/release_50/unittests/Support/Host.cpp

Modified: llvm/branches/release_50/lib/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/lib/Support/Host.cpp?rev=314437&r1=314436&r2=314437&view=diff
==============================================================================
--- llvm/branches/release_50/lib/Support/Host.cpp (original)
+++ llvm/branches/release_50/lib/Support/Host.cpp Thu Sep 28 10:52:12 2017
@@ -208,6 +208,7 @@ StringRef sys::detail::getHostCPUNameFor
             .Case("0x06f", "krait") // APQ8064
             .Case("0x201", "kryo")
             .Case("0x205", "kryo")
+            .Case("0xc00", "falkor")
             .Default("generic");
 
   return "generic";

Modified: llvm/branches/release_50/unittests/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/unittests/Support/Host.cpp?rev=314437&r1=314436&r2=314437&view=diff
==============================================================================
--- llvm/branches/release_50/unittests/Support/Host.cpp (original)
+++ llvm/branches/release_50/unittests/Support/Host.cpp Thu Sep 28 10:52:12 2017
@@ -105,6 +105,9 @@ TEST(getLinuxHostCPUName, AArch64) {
   EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
                                               "CPU part        : 0x201"),
             "kryo");
+  EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
+                                              "CPU part        : 0xc00"),
+            "falkor");
 
   // MSM8992/4 weirdness
   StringRef MSM8992ProcCpuInfo = R"(