[llvm] r299062 - Make naming in Host.h in line with coding standards.
Kristof Beyls via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 30 02:32:00 PDT 2017
Author: kbeyls
Date: Thu Mar 30 04:31:59 2017
New Revision: 299062
URL: http://llvm.org/viewvc/llvm-project?rev=299062&view=rev
Log:
Make naming in Host.h in line with coding standards.
Based on post-commit review comments by Chandler Carruth on
https://reviews.llvm.org/D31236. Thanks!
Modified:
llvm/trunk/include/llvm/Support/Host.h
llvm/trunk/lib/Support/Chrono.cpp
llvm/trunk/lib/Support/Host.cpp
llvm/trunk/unittests/Support/Host.cpp
Modified: llvm/trunk/include/llvm/Support/Host.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Host.h?rev=299062&r1=299061&r2=299062&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Host.h (original)
+++ llvm/trunk/include/llvm/Support/Host.h Thu Mar 30 04:31:59 2017
@@ -77,11 +77,11 @@ constexpr bool IsBigEndianHost = false;
/// Returns -1 if unknown for the current host system.
int getHostNumPhysicalCores();
- /// helper functions to extract HostCPUName from /proc/cpuinfo on linux.
- namespace LinuxReadCpuInfo {
- StringRef getHostCPUName_powerpc(const StringRef &ProcCpuinfoContent);
- StringRef getHostCPUName_arm(const StringRef &ProcCpuinfoContent);
- StringRef getHostCPUName_s390x(const StringRef &ProcCpuinfoContent);
+ namespace detail {
+ /// Helper functions to extract HostCPUName from /proc/cpuinfo on linux.
+ StringRef getHostCPUNameForPowerPC(const StringRef &ProcCpuinfoContent);
+ StringRef getHostCPUNameForARM(const StringRef &ProcCpuinfoContent);
+ StringRef getHostCPUNameForS390x(const StringRef &ProcCpuinfoContent);
}
}
}
Modified: llvm/trunk/lib/Support/Chrono.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Chrono.cpp?rev=299062&r1=299061&r2=299062&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Chrono.cpp (original)
+++ llvm/trunk/lib/Support/Chrono.cpp Thu Mar 30 04:31:59 2017
@@ -16,12 +16,12 @@ namespace llvm {
using namespace sys;
-const char detail::unit<std::ratio<3600>>::value[] = "h";
-const char detail::unit<std::ratio<60>>::value[] = "m";
-const char detail::unit<std::ratio<1>>::value[] = "s";
-const char detail::unit<std::milli>::value[] = "ms";
-const char detail::unit<std::micro>::value[] = "us";
-const char detail::unit<std::nano>::value[] = "ns";
+const char llvm::detail::unit<std::ratio<3600>>::value[] = "h";
+const char llvm::detail::unit<std::ratio<60>>::value[] = "m";
+const char llvm::detail::unit<std::ratio<1>>::value[] = "s";
+const char llvm::detail::unit<std::milli>::value[] = "ms";
+const char llvm::detail::unit<std::micro>::value[] = "us";
+const char llvm::detail::unit<std::nano>::value[] = "ns";
static inline struct tm getStructTM(TimePoint<> TP) {
struct tm Storage;
Modified: llvm/trunk/lib/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=299062&r1=299061&r2=299062&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Host.cpp (original)
+++ llvm/trunk/lib/Support/Host.cpp Thu Mar 30 04:31:59 2017
@@ -64,7 +64,7 @@ static std::unique_ptr<llvm::MemoryBuffe
return std::move(*Text);
}
-StringRef sys::LinuxReadCpuInfo::getHostCPUName_powerpc(
+StringRef sys::detail::getHostCPUNameForPowerPC(
const StringRef &ProcCpuinfoContent) {
// Access to the Processor Version Register (PVR) on PowerPC is privileged,
// and so we must use an operating-system interface to determine the current
@@ -144,7 +144,7 @@ StringRef sys::LinuxReadCpuInfo::getHost
.Default(generic);
}
-StringRef sys::LinuxReadCpuInfo::getHostCPUName_arm(
+StringRef sys::detail::getHostCPUNameForARM(
const StringRef &ProcCpuinfoContent) {
// The cpuid register on arm is not accessible from user space. On Linux,
// it is exposed through the /proc/cpuinfo file.
@@ -195,7 +195,7 @@ StringRef sys::LinuxReadCpuInfo::getHost
return "generic";
}
-StringRef sys::LinuxReadCpuInfo::getHostCPUName_s390x(
+StringRef sys::detail::getHostCPUNameForS390x(
const StringRef &ProcCpuinfoContent) {
// STIDP is a privileged operation, so use /proc/cpuinfo instead.
@@ -1197,19 +1197,19 @@ StringRef sys::getHostCPUName() {
StringRef sys::getHostCPUName() {
std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
const StringRef& Content = P ? P->getBuffer() : "";
- return LinuxReadCpuInfo::getHostCPUName_powerpc(Content);
+ return detail::getHostCPUNameForPowerPC(Content);
}
#elif defined(__linux__) && defined(__arm__)
StringRef sys::getHostCPUName() {
std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
const StringRef& Content = P ? P->getBuffer() : "";
- return LinuxReadCpuInfo::getHostCPUName_arm(Content);
+ return detail::getHostCPUNameForARM(Content);
}
#elif defined(__linux__) && defined(__s390x__)
StringRef sys::getHostCPUName() {
std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
const StringRef& Content = P ? P->getBuffer() : "";
- return LinuxReadCpuInfo::getHostCPUName_s390x(Content);
+ return detail::getHostCPUNameForS390x(Content);
}
#else
StringRef sys::getHostCPUName() { return "generic"; }
Modified: llvm/trunk/unittests/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/Host.cpp?rev=299062&r1=299061&r2=299062&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/Host.cpp (original)
+++ llvm/trunk/unittests/Support/Host.cpp Thu Mar 30 04:31:59 2017
@@ -66,19 +66,16 @@ Revision : 0000
Serial : 0000000000000000
)";
- EXPECT_EQ(sys::LinuxReadCpuInfo::getHostCPUName_arm(CortexA9ProcCpuinfo),
+ EXPECT_EQ(sys::detail::getHostCPUNameForARM(CortexA9ProcCpuinfo),
"cortex-a9");
- EXPECT_EQ(
- sys::LinuxReadCpuInfo::getHostCPUName_arm("CPU implementer : 0x41\n"
- "CPU part : 0xc0f"),
- "cortex-a15");
+ EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x41\n"
+ "CPU part : 0xc0f"),
+ "cortex-a15");
// Verify that both CPU implementer and CPU part are checked:
- EXPECT_EQ(
- sys::LinuxReadCpuInfo::getHostCPUName_arm("CPU implementer : 0x40\n"
- "CPU part : 0xc0f"),
- "generic");
- EXPECT_EQ(
- sys::LinuxReadCpuInfo::getHostCPUName_arm("CPU implementer : 0x51\n"
- "CPU part : 0x06f"),
- "krait");
+ EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x40\n"
+ "CPU part : 0xc0f"),
+ "generic");
+ EXPECT_EQ(sys::detail::getHostCPUNameForARM("CPU implementer : 0x51\n"
+ "CPU part : 0x06f"),
+ "krait");
}
More information about the llvm-commits
mailing list