ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-26 12:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'StefanBruens-fix_aarch64_gettimecounter'

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-03-15 08:17:42 +01:00
commit 52f21d6811
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/core/ngcore_api.hpp
View File

@ -71,7 +71,11 @@
#define NETGEN_ARCH_AMD64 #define NETGEN_ARCH_AMD64
#endif #endif
#if defined(__arm64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64)
#define NETGEN_ARCH_ARM64
#endif
#if defined(__arm__) || defined(_M_ARM)
#define NETGEN_ARCH_ARM #define NETGEN_ARCH_ARM
#endif #endif

2
libsrc/core/simd.hpp
View File

@ -26,7 +26,7 @@
#include "simd_avx512.hpp" #include "simd_avx512.hpp"
#endif #endif
#ifdef __arm64__ #ifdef __aarch64__
#include "simd_arm64.hpp" #include "simd_arm64.hpp"
#endif #endif

11
libsrc/core/utils.hpp
View File

@ -10,7 +10,7 @@
#include "ngcore_api.hpp" // for NGCORE_API and CPU arch macros #include "ngcore_api.hpp" // for NGCORE_API and CPU arch macros
#if defined(__APPLE__) && defined(NETGEN_ARCH_ARM) #if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
#include <mach/mach_time.h> #include <mach/mach_time.h>
#endif #endif
@ -58,12 +58,15 @@ namespace ngcore
inline TTimePoint GetTimeCounter() noexcept inline TTimePoint GetTimeCounter() noexcept
{ {
#if defined(__APPLE__) && defined(NETGEN_ARCH_ARM) #if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
return mach_absolute_time(); return mach_absolute_time();
#elif defined(NETGEN_ARCH_AMD64) #elif defined(NETGEN_ARCH_AMD64)
return __rdtsc(); return __rdtsc();
#elif defined(NETGEN_ARCH_ARM) #elif defined(NETGEN_ARCH_ARM64) && defined(__GNUC__)
return __builtin_readcyclecounter(); // __GNUC__ is also defined by CLANG. Use inline asm to read Generic Timer
unsigned long long tics;
__asm __volatile("mrs %0, CNTVCT_EL0" : "=&r" (tics));
return tics;
#else #else
#warning "Unsupported CPU architecture" #warning "Unsupported CPU architecture"
return 0; return 0;