From 55a55660cbc1e53e24ad0f6c4fddb37c213adbc0 Mon Sep 17 00:00:00 2001
From: nmeyer-ur <nils.meyer@ur.de>
Date: Sat, 9 May 2020 12:48:42 +0200
Subject: [PATCH] reverted changes

---
 Grid/simd/Grid_a64fx-fixedsize.h | 11 ++++++++---
 Grid/simd/Grid_vector_types.h    |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Grid/simd/Grid_a64fx-fixedsize.h b/Grid/simd/Grid_a64fx-fixedsize.h
index 232c2933..8c5999e3 100644
--- a/Grid/simd/Grid_a64fx-fixedsize.h
+++ b/Grid/simd/Grid_a64fx-fixedsize.h
@@ -30,6 +30,11 @@
 // Using SVE ACLE
 /////////////////////////////////////////////////////
 
+/* TODO
+ * Exchange
+ * prefetching
+*/
+
 //#ifndef GEN_SIMD_WIDTH
 //#define GEN_SIMD_WIDTH 64u
 //#endif
@@ -436,12 +441,12 @@ struct PrecisionChange {
     vecf sb_v = svcvt_f32_x(pg1d, b);
     return svuzp1(sa_v, sb_v);
   }
-  static inline void StoD (vecf s,vecd *a,vecd *b) {
+  static inline void StoD (vecf s,vecd &a,vecd &b) {
     pred pg1d = acle<double>::pg1();
     vecf sa_v = svzip1(s, s);
     vecf sb_v = svzip2(s, s);
-    *a = svcvt_f64_x(pg1d, sa_v);
-    *b = svcvt_f64_x(pg1d, sb_v);
+    a = svcvt_f64_x(pg1d, sa_v);
+    b = svcvt_f64_x(pg1d, sb_v);
   }
   static inline vech DtoH (vecd a,vecd b,vecd c,vecd d) {
 /*
diff --git a/Grid/simd/Grid_vector_types.h b/Grid/simd/Grid_vector_types.h
index c38fdd9e..a71817eb 100644
--- a/Grid/simd/Grid_vector_types.h
+++ b/Grid/simd/Grid_vector_types.h
@@ -958,6 +958,7 @@ accelerator_inline void precisionChange(vRealD    *out,vRealF    *in,int nvec)
   assert((nvec&0x1)==0);
   for(int m=0;m*2<nvec;m++){
     int n=m*2;
+    Optimization::PrecisionChange::StoD(in[m].v,out[n].v,out[n+1].v);
     // A64FXFIXEDSIZE FIXME
     // function call results in compile-time error:
     // In function ‘void Grid::precisionChange(Grid::vRealD*, Grid::vRealF*, int)’:
@@ -966,8 +967,6 @@ accelerator_inline void precisionChange(vRealD    *out,vRealF    *in,int nvec)
     // to an rvalue of type ‘vecd’ {aka ‘svfloat64_t’}
     // 961 |     Optimization::PrecisionChange::StoD(in[m].v,out[n].v,out[n+1].v);
     //  |                                                 ~~~~~~~^
-    // Optimization::PrecisionChange::StoD(in[m].v,out[n].v,out[n+1].v);
-    Optimization::PrecisionChange::StoD(in[m].v,&out[n].v,&out[n+1].v);
   }
 }
 accelerator_inline void precisionChange(vRealD    *out,vRealH    *in,int nvec)