OSSForks/tensorflow
1
0
Fork 0
mirror of https://github.com/zebrajr/tensorflow.git synced 2025-12-06 12:20:11 +01:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Adding support for s390x in calculation of cpu_frequency (#12201)

Browse Source
This commit is contained in:
namrata-ibm 2017-08-11 20:58:49 +05:30 committed by Rasmus Munk Larsen
parent 7a144ad7fa
commit ed6b0d9050
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/core/platform/profile_utils/cpu_utils.cc
View File

@ -28,7 +28,7 @@ namespace profile_utils {
static ICpuUtilsHelper* cpu_utils_helper_instance_ = nullptr; static ICpuUtilsHelper* cpu_utils_helper_instance_ = nullptr;
#if defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #if (defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__))
/* static */ uint64 CpuUtils::GetCycleCounterFrequency() { /* static */ uint64 CpuUtils::GetCycleCounterFrequency() {
static const uint64 cpu_frequency = GetCycleCounterFrequencyImpl(); static const uint64 cpu_frequency = GetCycleCounterFrequencyImpl();
return cpu_frequency; return cpu_frequency;

2
tensorflow/core/platform/profile_utils/cpu_utils.h
View File

@ -97,7 +97,7 @@ class CpuUtils {
// Return cycle counter frequency. // Return cycle counter frequency.
// As this method caches the cpu frequency internally, // As this method caches the cpu frequency internally,
// the first call will incur overhead, but not subsequent calls. // the first call will incur overhead, but not subsequent calls.
#if defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #if (defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__))
static uint64 GetCycleCounterFrequency(); static uint64 GetCycleCounterFrequency();
#else #else
static int64 GetCycleCounterFrequency(); static int64 GetCycleCounterFrequency();

2
tensorflow/core/platform/profile_utils/cpu_utils_test.cc
View File

@ -53,7 +53,7 @@ TEST_F(CpuUtilsTest, CheckGetCurrentClockCycle) {
} }
TEST_F(CpuUtilsTest, CheckCycleCounterFrequency) { TEST_F(CpuUtilsTest, CheckCycleCounterFrequency) {
#if defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #if (defined(__powerpc__) || defined(__ppc__) && ( __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__))
const uint64 cpu_frequency = CpuUtils::GetCycleCounterFrequency(); const uint64 cpu_frequency = CpuUtils::GetCycleCounterFrequency();
CHECK_GT(cpu_frequency, 0); CHECK_GT(cpu_frequency, 0);
CHECK_NE(cpu_frequency, unsigned(CpuUtils::INVALID_FREQUENCY)); CHECK_NE(cpu_frequency, unsigned(CpuUtils::INVALID_FREQUENCY));