Commit a9ebe385 authored by Tom Stellard's avatar Tom Stellard
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 314437
parent 7c188fa8

llvm/lib/Support/Host.cpp

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ StringRef sys::detail::getHostCPUNameForARM( 
            .Case("0x06f", "krait") // APQ8064

            .Case("0x201", "kryo")

            .Case("0x205", "kryo")

            .Case("0xc00", "falkor")

            .Default("generic");



  return "generic";

llvm/unittests/Support/Host.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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"(