Verified Commit 36ded0b8 authored by Michael R. Crusoe's avatar Michael R. Crusoe 🏳️‍🌈
Browse files

patch from upstream simde

parent f4925dce

debian/include/simde/simde-common.h

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ 
#  define SIMDE_CAST_ALIGN(alignment, T, v) \

    HEDLEY_DIAGNOSTIC_PUSH \

    _Pragma("clang diagnostic ignored \"-Wcast-align\"") \

    HEDLEY_STATIC_CAST(T, v) \

    ((T) (v)) \

    HEDLEY_DIAGNOSTIC_POP

#else

#  define SIMDE_CAST_ALIGN(alignment, T, v) HEDLEY_STATIC_CAST(T, v)

#  define SIMDE_CAST_ALIGN(alignment, T, v) ((T) (v))

#endif



#if HEDLEY_GCC_HAS_ATTRIBUTE(vector_size,4,6,0)

debian/patches/simde

+43 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 #define MCF_SIMD_HH

 

-#include <immintrin.h>

+#include "debian/include/simde/x86/avx2.h"

+#include "../debian/include/simde/x86/avx2.h"

 

 namespace mcf {
@@ -144,3 +144,45 @@ 
 }

 

 #endif

--- last-align.orig/src/GappedXdropAligner.cc

+++ last-align/src/GappedXdropAligner.cc

@@ -167,18 +167,13 @@

     if (isAffine) {

       for (int i = 0; i < numCells; i += simdLen) {

 	SimdInt s = simdSet(

-#ifdef __SSE4_1__

-//#ifdef __AVX2__

-#ifdef WANT_AVX2

 			    s1[7][s2[-7]],

 			    s1[6][s2[-6]],

 			    s1[5][s2[-5]],

 			    s1[4][s2[-4]],

-#endif

 			    s1[3][s2[-3]],

 			    s1[2][s2[-2]],

 			    s1[1][s2[-1]],

-#endif

 			    s1[0][s2[-0]]);

 	SimdInt x = simdLoad(x2+i);

 	SimdInt y = simdSub(simdLoad(y1+i), mDelGrowCost);

--- last-align.orig/src/GappedXdropAlignerPssm.cc

+++ last-align/src/GappedXdropAlignerPssm.cc

@@ -101,18 +101,13 @@

     if (isAffine) {

       for (int i = 0; i < numCells; i += simdLen) {

 	SimdInt s = simdSet(

-#ifdef __SSE4_1__

-//#ifdef __AVX2__

-#ifdef WANT_AVX2

 			    s2[-7][s1[7]],

 			    s2[-6][s1[6]],

 			    s2[-5][s1[5]],

 			    s2[-4][s1[4]],

-#endif

 			    s2[-3][s1[3]],

 			    s2[-2][s1[2]],

 			    s2[-1][s1[1]],

-#endif

 			    s2[-0][s1[0]]);

 	SimdInt x = simdLoad(x2+i);

 	SimdInt y = simdSub(simdLoad(y1+i), mDelGrowCost);