-
Couldn't load subscription status.
- Fork 146
fix 32-bit usage of size_t and support non-intel arches #207
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,9 @@ | |
| #ifdef NETGEN_ARCH_AMD64 | ||
| #ifdef WIN32 | ||
| #include <intrin.h> // for __rdtsc() CPU time step counter | ||
| #else | ||
| #define NGCORE_HAVE_RDTSC | ||
| #elif defined __SSE__ | ||
| #define NGCORE_HAVE_RDTSC | ||
| #include <x86intrin.h> // for __rdtsc() CPU time step counter | ||
| #endif // WIN32 | ||
| #endif // NETGEN_ARCH_AMD64 | ||
|
|
@@ -65,7 +67,7 @@ namespace ngcore | |
| { | ||
| #if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64) | ||
| return mach_absolute_time(); | ||
| #elif defined(NETGEN_ARCH_AMD64) | ||
| #elif defined(NETGEN_ARCH_AMD64) || defined(NGCORE_HAVE_RDTSC) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. change has no effect, NGCORE_HAVE_RDTSC is only ever defined if NETGEN_ARCH_AMD64 is defined. |
||
| return __rdtsc(); | ||
| #elif defined(NETGEN_ARCH_ARM64) && defined(__GNUC__) | ||
| // __GNUC__ is also defined by CLANG. Use inline asm to read Generic Timer | ||
|
|
@@ -74,6 +76,8 @@ namespace ngcore | |
| return tics; | ||
| #elif defined(__EMSCRIPTEN__) | ||
| return std::chrono::high_resolution_clock::now().time_since_epoch().count(); | ||
| #elifndef NGCORE_HAVE_RDTSC | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Always true ... |
||
| return TTimePoint(std::chrono::steady_clock::now().time_since_epoch().count()); | ||
| #else | ||
| #warning "Unsupported CPU architecture" | ||
| return 0; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,7 @@ | ||
| from .pyngcore import * | ||
|
|
||
| # <size_t> is the same as <unsigned int> on 32 bit arches | ||
| # in which case Array_I_S is not defined by python_ngcore_export.cpp. | ||
| # In this case identify it with Array_I_U. | ||
| try: Array_I_S | ||
| except NameError: Array_I_S=Array_I_U |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same define in both branches ...