Commit a260ebde by FritzFlorian

Merge remote-tracking branch 'origin/master'

parents 73264cda 2ad04ce5
Pipeline #1278 passed with stages
in 3 minutes 57 seconds
...@@ -80,7 +80,7 @@ int main() { ...@@ -80,7 +80,7 @@ int main() {
pls::internal::helpers::run_mini_benchmark([&] { pls::internal::helpers::run_mini_benchmark([&] {
complex_vector input = initial_input; complex_vector input = initial_input;
fft(input.begin(), input.size()); fft(input.begin(), input.size());
}, 8, 1000); }, 7, 30000);
PROFILE_SAVE("test_profile.prof") PROFILE_SAVE("test_profile.prof")
} }
...@@ -2,10 +2,19 @@ ...@@ -2,10 +2,19 @@
#ifndef PLS_SYSTEM_DETAILS_H #ifndef PLS_SYSTEM_DETAILS_H
#define PLS_SYSTEM_DETAILS_H #define PLS_SYSTEM_DETAILS_H
#include <cstdint> #if MSVC
#if (COMPILER == MVCC) #ifdef _M_X86
#include <emmintrin.h> #define ARCH_X86
#endif
#endif
#if GCC
#ifdef __i386__
#define ARCH_X86
#endif #endif
#endif
#include <cstdint>
namespace pls { namespace pls {
namespace internal { namespace internal {
...@@ -53,7 +62,9 @@ constexpr pointer_t CACHE_LINE_SIZE = 64; ...@@ -53,7 +62,9 @@ constexpr pointer_t CACHE_LINE_SIZE = 64;
* Choose the implementation appropriate for your compiler-cpu combination. * Choose the implementation appropriate for your compiler-cpu combination.
*/ */
inline void relax_cpu() { inline void relax_cpu() {
#ifdef ARCH_X86
asm volatile("pause":: : "memory"); asm volatile("pause":: : "memory");
#endif
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment