summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2017-09-28 17:52:12 +0000
committerTom Stellard <tstellar@redhat.com>2017-09-28 17:52:12 +0000
commitb1e6cc762cd729de01f1b4f3c0f6d9a493635ae0 (patch)
treee73b0ce16d147e1d16edb6c4ce01b09300e91c3a
parent43bd69c68c109e89158d4d3cafc6be4a4f56e299 (diff)
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. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@314437 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Support/Host.cpp1
-rw-r--r--unittests/Support/Host.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/Support/Host.cpp b/lib/Support/Host.cpp
index 5cf0316d4d71..f1c0d3ac32d2 100644
--- a/lib/Support/Host.cpp
+++ b/lib/Support/Host.cpp
@@ -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";
diff --git a/unittests/Support/Host.cpp b/unittests/Support/Host.cpp
index 4f895e7163c5..7c018ac50423 100644
--- a/unittests/Support/Host.cpp
+++ b/unittests/Support/Host.cpp
@@ -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"(