Changeset 10089 for ps

Timestamp:

08/24/11 11:23:44 (13 years ago)

Author:

Jan Wassenberg

Message:

SSE[2] didn't work on MSVC/ICC after all; introduce HAVE_SSE[2] instead

Location:

ps/trunk/source/lib

Files:

• pointer_typedefs.h (modified) (4 diffs)
• sysdep/compiler.h (modified) (1 diff)

ps/trunk/source/lib/pointer_typedefs.h

@@ -2 +2 @@
 #define INCLUDED_POINTER_TYPEDEFS
 
-#ifdef __SSE__
+#include "lib/sysdep/compiler.h"    // HAVE_SSE
+
+#if HAVE_SSE
 # include <xmmintrin.h>  // __m64, __m128
 #endif
-#ifdef __SSE2__
+#if HAVE_SSE2
 # include <emmintrin.h>  // __m128i, __m128d
 #endif
@@ -153 +155 @@
 typedef const double* const __restrict crpcDouble;
 
-#ifdef __SSE__
+#if HAVE_SSE
 typedef __m64* pM64;
 typedef __m64* const cpM64;
@@ -171 +173 @@
 typedef const __m128* __restrict rpcM128;
 typedef const __m128* const __restrict crpcM128;
-#endif // __SSE__
+#endif // #if HAVE_SSE
 
-#ifdef __SSE2__
+#if HAVE_SSE2
 typedef __m128i* pM128I;
 typedef __m128i* const cpM128I;
@@ -191 +193 @@
 typedef const __m128d* __restrict rpcM128D;
 typedef const __m128d* const __restrict crpcM128D;
-#endif // __SSE2__
+#endif // #if HAVE_SSE2
 
 #endif  // #ifndef INCLUDED_POINTER_TYPEDEFS

ps/trunk/source/lib/sysdep/compiler.h

@@ -99 +99 @@
 #endif
 
+
+// Streaming SIMD Extensions (not supported by all GCC)
+// this only ascertains compiler support; use x86_x64_cap to
+// check whether the instructions are supported by the CPU.
+#ifndef HAVE_SSE
+# if GCC_VERSION && defined(__SSE__)
+#  define HAVE_SSE 1
+# elif MSC_VERSION  // also includes ICC
+#  define HAVE_SSE 1
+# else
+#  define HAVE_SSE 0
+# endif
+#endif
+
+#ifndef HAVE_SSE2
+# if GCC_VERSION && defined(__SSE2__)
+#  define HAVE_SSE2 1
+# elif MSC_VERSION  // also includes ICC
+#  define HAVE_SSE2 1
+# else
+#  define HAVE_SSE2 0
+# endif
+#endif
+
 #endif  // #ifndef INCLUDED_COMPILER