xf86-video-intel: 2 commits - src/sna/compiler.h

[Chris Wilson]

 src/sna/compiler.h |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit f2807d3b5ee3a3ab27ba8216fa02f979338fba87
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Apr 24 13:08:24 2015 +0100

    sna: Reuse compiler attribute fast to build fast_memcpy
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/compiler.h b/src/sna/compiler.h
index eaabf83..c723137 100644
--- a/src/sna/compiler.h
+++ b/src/sna/compiler.h
@@ -73,10 +73,8 @@
 #define avx2 fast __attribute__((target("avx2,avx,sse4.2,sse2,fpmath=sse")))
 #endif
 
-#if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
-#define fast_memcpy __attribute__((optimize("Ofast"))) __attribute__((target("inline-all-stringops")))
-#elif HAS_GCC(4, 5) && defined(__OPTIMIZE__)
-#define fast_memcpy __attribute__((target("inline-all-stringops")))
+#if HAS_GCC(4, 5) && defined(__OPTIMIZE__)
+#define fast_memcpy fast __attribute__((target("inline-all-stringops")))
 #else
 #define fast_memcpy
 #endif
commit 0bcc3ef02c48edbf838e2665c096cc5cf5cc50c0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Apr 24 12:32:19 2015 +0100

    sna: Mark avx as being a subset of avx2 optimisations
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/compiler.h b/src/sna/compiler.h
index 44d17db..eaabf83 100644
--- a/src/sna/compiler.h
+++ b/src/sna/compiler.h
@@ -63,16 +63,16 @@
 #define sse4_2 __attribute__((target("sse4.2,sse2,fpmath=sse")))
 #endif
 
-#if HAS_GCC(4, 7)
-#define avx2 __attribute__((target("avx2,sse4.2,sse2,fpmath=sse")))
-#endif
-
 #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
 #define fast __attribute__((optimize("Ofast")))
 #else
 #define fast
 #endif
 
+#if HAS_GCC(4, 7)
+#define avx2 fast __attribute__((target("avx2,avx,sse4.2,sse2,fpmath=sse")))
+#endif
+
 #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
 #define fast_memcpy __attribute__((optimize("Ofast"))) __attribute__((target("inline-all-stringops")))
 #elif HAS_GCC(4, 5) && defined(__OPTIMIZE__)