4509de
From 999efd5370b33e8b02d9370eda3d454e08fc9d15 Mon Sep 17 00:00:00 2001
4509de
From: Andreas Arnez <arnez@linux.ibm.com>
4509de
Date: Wed, 5 Dec 2018 18:59:15 +0100
4509de
Subject: [PATCH 3/8] Fix SIMD support on IBM z13
4509de
4509de
The header file atlas_simd.h contained a syntax error and a few functional
4509de
errors that affected IBM z13.  It prevented any SIMD kernels from being
4509de
compiled successfully for that platform.  This is fixed.  The macro
4509de
vec_madd is avoided, because some GCC versions don't implement it
4509de
correctly; the equivalent GCC builtin __builtin_s390_vec_madd is used
4509de
instead.
4509de
---
4509de
 include/atlas_simd.h | 10 +++++-----
4509de
 1 file changed, 5 insertions(+), 5 deletions(-)
4509de
4509de
diff --git a/include/atlas_simd.h b/include/atlas_simd.h
4509de
index baee6b1..68daf79 100644
4509de
--- a/include/atlas_simd.h
4509de
+++ b/include/atlas_simd.h
4509de
@@ -69,7 +69,7 @@
4509de
          #define ATL_FRCGNUVEC
4509de
       #endif
4509de
    #elif defined(ATL_VXZ)
4509de
-      #if ATL_VLEN != 2;
4509de
+      #if ATL_VLEN != 2
4509de
          #define ATL_FRCGNUVEC
4509de
       #endif
4509de
    #elif defined(ATL_NEON)
4509de
@@ -390,19 +390,19 @@
4509de
       #define ATL_vld(v_, p_) v_ = vec_ld2f(p_);
4509de
       #define ATL_vst(p_, v_) vec_st2f(v_, p_);
4509de
    #endif
4509de
-   #define ATL_vzero(v_) v_ = vec_splats((TYPE)0.0)
4509de
+   #define ATL_vzero(v_) v_ = vec_splats((double)0.0)
4509de
    #define ATL_vcopy(d_, s_) d_ = s_
4509de
-   #define ATL_vbcast(v_, p_) v_ =  vec_splats(*((TYPE*)(p_)))
4509de
+   #define ATL_vbcast(v_, p_) v_ = vec_splats((double)*((TYPE*)(p_)))
4509de
    #define ATL_vuld(v_, p_) ATL_vld(v_, p_)
4509de
    #define ATL_vust(p_, v_) ATL_vst(p_, v_)
4509de
    #define ATL_vadd(d_, s1_, s2_) d_ =  s1_ + s2_
4509de
    #define ATL_vsub(d_, s1_, s2_) d_ =  s1_ - s2_
4509de
    #define ATL_vmul(d_, s1_, s2_) d_ =  s1_ * s2_
4509de
-   #define ATL_vmac(d_, s1_, s2_) d_ = vec_madd(s1_, s2_, d_)
4509de
+   #define ATL_vmac(d_, s1_, s2_) d_ = __builtin_s390_vec_madd(s1_, s2_, d_)
4509de
    #define ATL_vvrsum1(s0_) \
4509de
    {  ATL_VTYPE t_;\
4509de
       t_ = vec_splat(s0_, 1); \
4509de
-      s0 += t_; \
4509de
+      s0_ += t_; \
4509de
    }
4509de
    #define ATL_vsplat0(d_, s_) d_ = vec_splat(s_, 0)
4509de
    #define ATL_vsplat1(d_, s_) d_ = vec_splat(s_, 1)
4509de
-- 
4509de
2.23.0
4509de