From 46f5c1fe6ae2516a0971c0b4282dcc3e83265382 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 23 Mar 2023 04:22:54 +0100 Subject: [PATCH] Move and rename SDL_rdtsc macro to testautomation --- include/SDL3/SDL_intrin.h | 9 --------- test/testautomation_intrinsics.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/SDL3/SDL_intrin.h b/include/SDL3/SDL_intrin.h index 811047a0e2..928a3060a0 100644 --- a/include/SDL3/SDL_intrin.h +++ b/include/SDL3/SDL_intrin.h @@ -110,15 +110,6 @@ _m_prefetch(void *__P) #endif #if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) -# if (defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)) || defined(__clang__) || defined(__ICC)) && !defined(SDL_DISABLE_RDTSC) -# define SDL_RDTSC_INTRINSICS 1 -# if defined(_MSC_VER) -# include -# else -# include -# endif -# define SDL_rdtsc __rdtsc -# endif # if ((defined(_MSC_VER) && !defined(_M_X64)) || defined(__MMX__) || defined(SDL_HAS_TARGET_ATTRIBS)) && !defined(SDL_DISABLE_MMX) # define SDL_MMX_INTRINSICS 1 # include diff --git a/test/testautomation_intrinsics.c b/test/testautomation_intrinsics.c index 2819495ca3..854dc7d49a 100644 --- a/test/testautomation_intrinsics.c +++ b/test/testautomation_intrinsics.c @@ -10,6 +10,19 @@ #include #include "testautomation_suites.h" +#if (defined(_MSC_VER) \ + || (defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5)) \ + || (defined(__clang__) && (__clang_major__ > 3 || __clang_major__ == 3 && __clang_minor__ >= 5)) \ + || defined(__ICC)) && !defined(SDL_DISABLE_RDTSC) +# define SDL_RDTSC_INTRINSICS 1 +# if defined(_MSC_VER) +# include +# else +# include +# endif +# define SDLTest_rdtsc __rdtsc +#endif + // FIXME: missing tests for loongarch lsx/lasx // FIXME: missing tests for powerpc altivec @@ -368,7 +381,7 @@ static int intrinsics_testRDTSC(void *arg) { Sint64 ticks; - ticks = SDL_rdtsc(); + ticks = SDLTest_rdtsc(); SDLTest_AssertCheck(SDL_TRUE, "rdtsc returned: %" SDL_PRIu64 " ticks", ticks);