mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 08:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'update-kwsys'

Browse Source 
8191d39119 Merge branch 'upstream-KWSys' into update-kwsys
e833e660ef KWSys 2020-04-21 (44086372)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4646
This commit is contained in:
Brad King
2020-04-22 12:33:15 +00:00
committed by Kitware Robot
parent 60831cfb22 8191d39119
commit acecd76f03
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/SystemInformation.cxx
View File

@@ -204,7 +204,8 @@ typedef struct rlimit ResourceLimitType;
# define USE_ASM_INSTRUCTIONS 0
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__clang__)
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__clang__) && \
!defined(_M_ARM64)
# include <intrin.h>
# define USE_CPUID_INTRINSICS 1
#else
@@ -4322,9 +4323,15 @@ SystemInformationImplementation::GetCyclesDifference(DELAY_FUNC DelayFunction,
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
unsigned __int64 stamp1, stamp2;
# ifdef _M_ARM64
stamp1 = _ReadStatusReg(ARM64_PMCCNTR_EL0);
DelayFunction(uiParameter);
stamp2 = _ReadStatusReg(ARM64_PMCCNTR_EL0);
# else
stamp1 = __rdtsc();
DelayFunction(uiParameter);
stamp2 = __rdtsc();
# endif
return stamp2 - stamp1;
#elif USE_ASM_INSTRUCTIONS