From 87266ce09948fefc74e30c71946927590f63ff09 Mon Sep 17 00:00:00 2001 From: nmeyer-ur Date: Fri, 12 Jun 2020 18:37:19 +0200 Subject: [PATCH] comment out fcmla in vector types: need also MultAddReal --- Grid/simd/Grid_vector_types.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Grid/simd/Grid_vector_types.h b/Grid/simd/Grid_vector_types.h index 246c6a6a..33ba8f75 100644 --- a/Grid/simd/Grid_vector_types.h +++ b/Grid/simd/Grid_vector_types.h @@ -327,7 +327,8 @@ public: // FIXME -- alias this to an accelerator_inline MAC struct. - #if defined(A64FX) || defined(A64FXFIXEDSIZE) + //#if defined(A64FX) || defined(A64FXFIXEDSIZE) + #if 0 friend accelerator_inline void mac(Grid_simd *__restrict__ y, const Grid_simd *__restrict__ a, const Grid_simd *__restrict__ x) { @@ -820,7 +821,8 @@ accelerator_inline Grid_simd operator*(Grid_simd a, Grid_simd // ---------------- A64FX MAC ------------------- // Distinguish between complex types and others -#if defined(A64FX) || defined(A64FXFIXEDSIZE) +//#if defined(A64FX) || defined(A64FXFIXEDSIZE) +#if 0 template = 0> accelerator_inline Grid_simd fxmac(Grid_simd a, Grid_simd b, Grid_simd c) { Grid_simd ret; @@ -832,6 +834,7 @@ accelerator_inline Grid_simd fxmac(Grid_simd a, Grid_simd b, G template = 0> accelerator_inline Grid_simd fxmac(Grid_simd a, Grid_simd b, Grid_simd c) { Grid_simd ret; +// MultSIMD takes only 2 args -> need MultAddReal ret.v = trinary(a.v, b.v, c.v, MultSIMD()); return ret; };