From 016810d9827556dd977eba11264698c3dd25fd61 Mon Sep 17 00:00:00 2001
From: Ari Koivula <ari@koivu.la>
Date: Thu, 31 Mar 2016 14:31:47 +0300
Subject: [PATCH] Move COMPILE_ macro to global.h

While these are only used for strategies, it's non-intuitive to have
to include strategyselector.h in every file under strategies before
including anything else.
---
 src/global.h           | 63 ++++++++++++++++++++++++++++++++++++++++
 src/strategyselector.h | 65 ------------------------------------------
 2 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/src/global.h b/src/global.h
index 3cc3f7c5..026ef96c 100644
--- a/src/global.h
+++ b/src/global.h
@@ -256,4 +256,67 @@ typedef int16_t coeff_t;
 //Constants
 typedef enum { COLOR_Y = 0, COLOR_U, COLOR_V, NUM_COLORS } color_t;
 
+
+// Hardware data (abstraction of defines). Extend for other compilers
+#if defined(_M_IX86) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
+#  define COMPILE_INTEL 1
+#else
+#  define COMPILE_INTEL 0
+#endif
+
+// Visual Studio note:
+// Because these macros are only used to guard code that is guarded by CPUID
+// at runtime, use /arch parameter to disable them, but enable all intrinsics
+// supported by VisualStudio if SSE2 (highest) is enabled.
+// AVX and AVX2 are handled by /arch directly and sse intrinsics will use VEX
+// versions if they are defined.
+#define MSC_X86_SIMD(level) (_M_X64 || (_M_IX86_FP >= (level)))
+
+#if COMPILE_INTEL
+#  if defined(__MMX__) || MSC_X86_SIMD(1)
+#    define COMPILE_INTEL_MMX 1
+#  endif
+#  if defined(__SSE__) || MSC_X86_SIMD(1)
+#    define COMPILE_INTEL_SSE 1
+#  endif
+#  if defined(__SSE2__) || MSC_X86_SIMD(2)
+#    define COMPILE_INTEL_SSE2 1
+#  endif
+#  if defined(__SSE3__)
+#    define COMPILE_INTEL_SSE3 1
+#  endif
+#  if defined(__SSSE3__) || MSC_X86_SIMD(2)
+#    define COMPILE_INTEL_SSSE3 1
+#  endif
+#  if defined(__SSE4_1__) || MSC_X86_SIMD(2)
+#    define COMPILE_INTEL_SSE41 1
+#  endif
+#  if defined(__SSE4_2__) || MSC_X86_SIMD(2)
+#    define COMPILE_INTEL_SSE42 1
+#  endif
+#  if defined(__AVX__)
+#    define COMPILE_INTEL_AVX 1
+#   endif
+#  if defined(__AVX2__)
+#    define COMPILE_INTEL_AVX2 1
+#   endif
+#endif
+
+#if defined (_M_PPC) || defined(__powerpc64__) || defined(__powerpc__)
+#  define COMPILE_POWERPC 1
+#  ifdef __ALTIVEC__
+#    define COMPILE_POWERPC_ALTIVEC 1
+#  else
+#    define COMPILE_POWERPC_ALTIVEC 0
+#  endif
+#else
+#  define COMPILE_POWERPC 0
+#endif
+
+#if defined (_M_ARM) || defined(__arm__) || defined(__thumb__)
+#  define COMPILE_ARM 1
+#else
+#  define COMPILE_ARM 0
+#endif
+
 #endif
diff --git a/src/strategyselector.h b/src/strategyselector.h
index b7739126..6be48f62 100644
--- a/src/strategyselector.h
+++ b/src/strategyselector.h
@@ -32,71 +32,6 @@
 # define DEBUG_STRATEGYSELECTOR
 #endif
 
-//Hardware data (abstraction of defines). Extend for other compilers
-
-#if defined(_M_IX86) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
-#  define COMPILE_INTEL 1
-#else
-#  define COMPILE_INTEL 0
-#endif
-
-// Visual Studio note:
-// Because these macros are only used to guard code that is guarded by CPUID
-// at runtime, use /arch parameter to disable them, but enable all intrinsics
-// supported by VisualStudio if SSE2 (highest) is enabled.
-// AVX and AVX2 are handled by /arch directly and sse intrinsics will use VEX
-// versions if they are defined.
-#define MSC_X86_SIMD(level) (_M_X64 || (_M_IX86_FP >= (level)))
-
-#if COMPILE_INTEL
-#  if defined(__MMX__) || MSC_X86_SIMD(1)
-#    define COMPILE_INTEL_MMX 1
-#  endif
-#  if defined(__SSE__) || MSC_X86_SIMD(1)
-#    define COMPILE_INTEL_SSE 1
-#  endif
-#  if defined(__SSE2__) || MSC_X86_SIMD(2)
-#    define COMPILE_INTEL_SSE2 1
-#  endif
-#  if defined(__SSE3__)
-#    define COMPILE_INTEL_SSE3 1
-#  endif
-#  if defined(__SSSE3__) || MSC_X86_SIMD(2)
-#    define COMPILE_INTEL_SSSE3 1
-#  endif
-#  if defined(__SSE4_1__) || MSC_X86_SIMD(2)
-#    define COMPILE_INTEL_SSE41 1
-#  endif
-#  if defined(__SSE4_2__) || MSC_X86_SIMD(2)
-#    define COMPILE_INTEL_SSE42 1
-#  endif
-#  if defined(__AVX__)
-#    define COMPILE_INTEL_AVX 1
-#   endif
-#  if defined(__AVX2__)
-#    define COMPILE_INTEL_AVX2 1
-#   endif
-#endif
-
-#if defined (_M_PPC) || defined(__powerpc64__) || defined(__powerpc__)
-#  define COMPILE_POWERPC 1
-#  ifdef __ALTIVEC__
-#    define COMPILE_POWERPC_ALTIVEC 1
-#  else
-#    define COMPILE_POWERPC_ALTIVEC 0
-#  endif
-#else
-#  define COMPILE_POWERPC 0
-#endif
-
-#if defined (_M_ARM) || defined(__arm__) || defined(__thumb__)
-#  define COMPILE_ARM 1
-#else
-#  define COMPILE_ARM 0
-#endif
-
-
-
 typedef struct {
   const char *type; //Type of the function, usually its name
   const char *strategy_name; //Name of the strategy (e.g. sse2)