[Debian-med-packaging] Bug#871697: jellyfish: Please add arm64

[Andreas Tille]

Hi,

On Thu, Aug 31, 2017 at 09:24:48PM +0100, Edmund Grimley Evans wrote:
> > > Instead of:   "pand " off
> > > It should be: "pand " #off
> > 
> > please excuse my ignorance for ASM - but could you please simply send
> > me a corrected quilt patch.  I do not understand what you mean.
> 
> Modified file is attached.
> 
> (The '#' is just the C preprocessor stringification operator as I've
> changed the macro argument from string to integer constant.)

Sorry, but this patch does not apply.  You have recommended a change
of the *original* code.  That's no proper quilt patch.

Kind regards

      Andreas.

> Author: Edmund Grimley Evans <edmund.grimley.evans at gmail.com>
> Last-Update: Thu, 10 Aug 2017 18:27:02 UTC
> Bug-Debian: https://bugs.debian.org/871697
> Description: Replace asm statements by C code to increase portability
> Note: Does not work as described - needs verification
> 
> --- a/include/jellyfish/rectangular_binary_matrix.hpp
> +++ b/include/jellyfish/rectangular_binary_matrix.hpp
> @@ -276,13 +276,20 @@ namespace jellyfish {
>  // #pragma GCC diagnostic pop
>  
>      // i is the lower 2 bits of x, and an index into the smear array. Compute res ^= smear[i] & p[j].
> +#ifdef __x86_64__
>  #define AND_XOR(off)                                                    \
>      asm("movdqa (%[s],%[i]), %[load]\n\t"                               \
>          "pand " #off "(%[p]),%[load]\n\t"                               \
>          "pxor %[load],%[acc]\n\t"                                       \
>          : [acc]"=&x"(acc)                                               \
>          : "[acc]"(acc),  [i]"r"(i), [p]"r"(p), [s]"r"(smear), [load]"x"(load))
> -
> +#else
> +#define AND_XOR(off) do {                                               \
> +        xmm_t a = { smear[i / 8], smear[i / 8 + 1] };                   \
> +        xmm_t b = { p[(off) / 8], p[(off) / 8 + 1] };                   \
> +        acc ^= a & b;                                                   \
> +    } while (0)
> +#endif
>  
>      uint64_t i, j = 0, x = 0;
>      for(unsigned int w = 0; w < nb_words(); ++w) {
> @@ -294,16 +301,16 @@ namespace jellyfish {
>        }
>        for( ; j > 7; j -= 8, p -= 8) {
>          i = (x & (uint64_t)0x3) << 4;
> -        AND_XOR("0x30");
> +        AND_XOR(0x30);
>          x >>= 2;
>          i = (x & (uint64_t)0x3) << 4;
> -        AND_XOR("0x20");
> +        AND_XOR(0x20);
>          x >>= 2;
>          i = (x & (uint64_t)0x3) << 4;
> -        AND_XOR("0x10");
> +        AND_XOR(0x10);
>          x >>= 2;
>          i = (x & (uint64_t)0x3) << 4;
> -        AND_XOR("");
> +        AND_XOR(0);
>          x >>= 2;
>        }
>      }
> @@ -313,18 +320,19 @@ namespace jellyfish {
>      switch(j) {
>      case 6:
>        i = (x & (uint64_t)0x3) << 4;
> -      AND_XOR("0x20");
> +      AND_XOR(0x20);
>        x >>= 2;
>      case 4:
>        i = (x & (uint64_t)0x3) << 4;
> -      AND_XOR("0x10");
> +      AND_XOR(0x10);
>        x >>= 2;
>      case 2:
>        i = (x & (uint64_t)0x3) << 4;
> -      AND_XOR("");
> +      AND_XOR(0);
>      }
>  
>      // Get result out
> +#ifdef __x86_64__
>      uint64_t res1, res2;
>      asm("movd %[acc], %[res1]\n\t"
>          "psrldq $8, %[acc]\n\t"
> @@ -332,6 +340,10 @@ namespace jellyfish {
>          : [res1]"=r"(res1), [res2]"=r"(res2)
>          : [acc]"x"(acc));
>      return res1 ^ res2;
> +#else
> +    return acc[0] ^ acc[1];
> +#endif
> +
>    }
>  #endif // HAVE_SSE
>  


-- 
http://fam-tille.de