Merge branch 'master' of https://github.com/paboyle/Grid

Conflicts:
	lib/Make.inc

.gitignore

@@ -49,7 +49,7 @@ config.status
 /stamp-h1
 /config.sub
 /config.guess
-
+/INSTALL
 
 # Packages #
 ############

INSTALL

@@ -1 +1 @@
-/opt/local/share/automake-1.15/INSTALL
+/usr/share/automake-1.14/INSTALL

configure

@@ -2574,7 +2574,7 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
-am__api_version='1.15'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2746,8 +2746,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# Expand $ac_aux_dir to an absolute path.
+# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+am_aux_dir=`cd $ac_aux_dir && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2766,7 +2766,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh+set}" != xset; then
+if test x"${install_sh}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3094,8 +3094,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target (and possibly the TAP driver).  The
+# We need awk for the "check" target.  The system "awk" is bad on
-# system "awk" is bad on some platforms.
+# some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3154,7 +3154,6 @@ END
 fi
 
 
-
 ac_config_headers="$ac_config_headers lib/GridConfig.h"
 
 # Check whether --enable-silent-rules was given.
@@ -6003,6 +6002,7 @@ $as_echo "$as_me: WARNING: Your processor supports fma instructions but not your
 
 
 
+
 # Checks for libraries.
 #AX_GCC_VAR_ATTRIBUTE(aligned)
 
@@ -6709,8 +6709,21 @@ $as_echo "#define AVX512 1" >>confdefs.h
 
        supported="cross compilation"
      ;;
+     NEONv7)
+       echo Configuring for experimental ARMv7 support
+
+$as_echo "#define NEONv7 1" >>confdefs.h
+
+       supported="cross compilation"
+     ;;
+     DEBUG)
+       echo Configuring without SIMD support - only for compiler DEBUGGING!
+
+$as_echo "#define EMPTY_SIMD 1" >>confdefs.h
+
+      ;;
      *)
-     as_fn_error $? "${ac_SIMD} unsupported --enable-simd option" "$LINENO" 5;
+     as_fn_error $? "${ac_SIMD} flag unsupported as --enable-simd option\nRun ./configure --help for the list of options" "$LINENO" 5;
      ;;
 esac
 

configure.ac

@@ -3,7 +3,7 @@
 #
 # Project Grid package  
 # 
-# Time-stamp: <2015-05-27 18:51:47 neo>
+# Time-stamp: <2015-06-09 15:26:39 neo>
 
 AC_PREREQ([2.63])
 AC_INIT([Grid], [1.0], [paboyle@ph.ed.ac.uk])
@@ -29,6 +29,7 @@ AC_PROG_RANLIB
 AX_CXX_COMPILE_STDCXX_11(noext, mandatory)
 AX_EXT
 
+
 # Checks for libraries.
 #AX_GCC_VAR_ATTRIBUTE(aligned)
 
@@ -75,7 +76,7 @@ supported=no
 case ${ac_SIMD} in
      SSE4)
        echo Configuring for SSE4
-       AC_DEFINE([SSE4],[1],[SSE4] )
+       AC_DEFINE([SSE4],[1],[SSE4 Intrinsics] )
        if test x"$ax_cv_support_ssse3_ext" = x"yes"; then  dnl minimal support for SSE4
          supported=yes
        else
@@ -84,7 +85,7 @@ case ${ac_SIMD} in
      ;;
      AVX)
        echo Configuring for AVX
-       AC_DEFINE([AVX1],[1],[AVX] )
+       AC_DEFINE([AVX1],[1],[AVX Intrinsics] )
        if test x"$ax_cv_support_avx_ext" = x"yes"; then  dnl minimal support for AVX
        supported=yes			  
        else
@@ -93,7 +94,7 @@ case ${ac_SIMD} in
      ;;
      AVX2)
        echo Configuring for AVX2
-       AC_DEFINE([AVX2],[1],[AVX2] )
+       AC_DEFINE([AVX2],[1],[AVX2 Intrinsics] )
        if test x"$ax_cv_support_avx2_ext" = x"yes"; then  dnl minimal support for AVX2
        supported=yes
        else
@@ -102,11 +103,20 @@ case ${ac_SIMD} in
      ;;
      AVX512|MIC)
        echo Configuring for AVX512 and MIC
-       AC_DEFINE([AVX512],[1],[AVX512] )
+       AC_DEFINE([AVX512],[1],[AVX512 Intrinsics for Knights Corner] )
        supported="cross compilation"
      ;;
+     NEONv7)
+       echo Configuring for experimental ARMv7 support 
+       AC_DEFINE([NEONv7],[1],[NEON ARMv7 Experimental support ] )
+       supported="cross compilation"
+     ;;
+     DEBUG)
+       echo Configuring without SIMD support - only for compiler DEBUGGING!
+       AC_DEFINE([EMPTY_SIMD],[1],[EMPTY_SIMD only for DEBUGGING] )
+      ;;     
      *)
-     AC_MSG_ERROR([${ac_SIMD} unsupported --enable-simd option]); 
+     AC_MSG_ERROR([${ac_SIMD} flag unsupported as --enable-simd option\nRun ./configure --help for the list of options]); 
      ;;
 esac
 

lib/GridConfig.h

@@ -1,15 +1,18 @@
 /* lib/GridConfig.h.  Generated from GridConfig.h.in by configure.  */
 /* lib/GridConfig.h.in.  Generated from configure.ac by autoheader.  */
 
-/* AVX */
+/* AVX Intrinsics */
 /* #undef AVX1 */
 
-/* AVX2 */
+/* AVX2 Intrinsics */
 /* #undef AVX2 */
 
-/* AVX512 */
+/* AVX512 Intrinsics for Knights Corner */
 /* #undef AVX512 */
 
+/* EMPTY_SIMD only for DEBUGGING */
+/* #undef EMPTY_SIMD */
+
 /* GRID_COMMS_MPI */
 /* #undef GRID_COMMS_MPI */
 
@@ -111,6 +114,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* NEON ARMv7 Experimental support */
+/* #undef NEONv7 */
+
 /* Name of package */
 #define PACKAGE "grid"
 
@@ -132,7 +138,7 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "1.0"
 
-/* SSE4 */
+/* SSE4 Intrinsics */
 #define SSE4 1
 
 /* Define to 1 if you have the ANSI C header files. */

lib/GridConfig.h.in

@@ -1,14 +1,17 @@
 /* lib/GridConfig.h.in.  Generated from configure.ac by autoheader.  */
 
-/* AVX */
+/* AVX Intrinsics */
 #undef AVX1
 
-/* AVX2 */
+/* AVX2 Intrinsics */
 #undef AVX2
 
-/* AVX512 */
+/* AVX512 Intrinsics for Knights Corner */
 #undef AVX512
 
+/* EMPTY_SIMD only for DEBUGGING */
+#undef EMPTY_SIMD
+
 /* GRID_COMMS_MPI */
 #undef GRID_COMMS_MPI
 
@@ -110,6 +113,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* NEON ARMv7 Experimental support */
+#undef NEONv7
+
 /* Name of package */
 #undef PACKAGE
 
@@ -131,7 +137,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* SSE4 */
+/* SSE4 Intrinsics */
 #undef SSE4
 
 /* Define to 1 if you have the ANSI C header files. */

lib/Make.inc

@@ -1,4 +1,4 @@
 
-HFILES=./algorithms/approx/bigfloat.h ./algorithms/approx/bigfloat_double.h ./algorithms/approx/Chebyshev.h ./algorithms/approx/MultiShiftFunction.h ./algorithms/approx/Remez.h ./algorithms/approx/Zolotarev.h ./algorithms/CoarsenedMatrix.h ./algorithms/iterative/ConjugateGradient.h ./algorithms/iterative/ConjugateGradientMultiShift.h ./algorithms/iterative/ConjugateResidual.h ./algorithms/iterative/NormalEquations.h ./algorithms/iterative/SchurRedBlack.h ./algorithms/LinearOperator.h ./algorithms/SparseMatrix.h ./Algorithms.h ./AlignedAllocator.h ./cartesian/Cartesian_base.h ./cartesian/Cartesian_full.h ./cartesian/Cartesian_red_black.h ./Cartesian.h ./communicator/Communicator_base.h ./Communicator.h ./cshift/Cshift_common.h ./cshift/Cshift_mpi.h ./cshift/Cshift_none.h ./Cshift.h ./Grid.h ./GridConfig.h ./lattice/Lattice_arith.h ./lattice/Lattice_base.h ./lattice/Lattice_comparison.h ./lattice/Lattice_comparison_utils.h ./lattice/Lattice_conformable.h ./lattice/Lattice_coordinate.h ./lattice/Lattice_ET.h ./lattice/Lattice_local.h ./lattice/Lattice_overload.h ./lattice/Lattice_peekpoke.h ./lattice/Lattice_reality.h ./lattice/Lattice_reduction.h ./lattice/Lattice_rng.h ./lattice/Lattice_trace.h ./lattice/Lattice_transfer.h ./lattice/Lattice_transpose.h ./lattice/Lattice_unary.h ./lattice/Lattice_where.h ./Lattice.h ./parallelIO/NerscIO.h ./qcd/action/Actions.h ./qcd/action/DiffAction.h ./qcd/action/fermion/CayleyFermion5D.h ./qcd/action/fermion/ContinuedFractionFermion5D.h ./qcd/action/fermion/DomainWallFermion.h ./qcd/action/fermion/FermionOperator.h ./qcd/action/fermion/g5HermitianLinop.h ./qcd/action/fermion/MobiusFermion.h ./qcd/action/fermion/MobiusZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h ./qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonContfracTanhFermion.h ./qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h ./qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h ./qcd/action/fermion/PartialFractionFermion5D.h ./qcd/action/fermion/ScaledShamirFermion.h ./qcd/action/fermion/ShamirZolotarevFermion.h ./qcd/action/fermion/WilsonCompressor.h ./qcd/action/fermion/WilsonFermion.h ./qcd/action/fermion/WilsonFermion5D.h ./qcd/action/fermion/WilsonKernels.h ./qcd/action/gauge/GaugeActionBase.h ./qcd/action/gauge/WilsonGaugeAction.h ./qcd/QCD.h ./qcd/spin/Dirac.h ./qcd/spin/TwoSpinor.h ./qcd/utils/CovariantCshift.h ./qcd/utils/LinalgUtils.h ./qcd/utils/SpaceTimeGrid.h ./qcd/utils/WilsonLoops.h ./simd/Grid_avx.h ./simd/Grid_avx512.h ./simd/Grid_qpx.h ./simd/Grid_sse4.h ./simd/Grid_vector_types.h ./simd/Grid_vector_unops.h ./simd/Old/Grid_vComplexD.h ./simd/Old/Grid_vComplexF.h ./simd/Old/Grid_vInteger.h ./simd/Old/Grid_vRealD.h ./simd/Old/Grid_vRealF.h ./Simd.h ./stencil/Lebesgue.h ./Stencil.h ./tensors/Tensor_arith.h ./tensors/Tensor_arith_add.h ./tensors/Tensor_arith_mac.h ./tensors/Tensor_arith_mul.h ./tensors/Tensor_arith_scalar.h ./tensors/Tensor_arith_sub.h ./tensors/Tensor_class.h ./tensors/Tensor_extract_merge.h ./tensors/Tensor_inner.h ./tensors/Tensor_outer.h ./tensors/Tensor_peek.h ./tensors/Tensor_poke.h ./tensors/Tensor_reality.h ./tensors/Tensor_Ta.h ./tensors/Tensor_trace.h ./tensors/Tensor_traits.h ./tensors/Tensor_transpose.h ./tensors/Tensor_unary.h ./Tensors.h ./Threads.h
+HFILES=./algorithms/approx/bigfloat.h ./algorithms/approx/bigfloat_double.h ./algorithms/approx/Chebyshev.h ./algorithms/approx/MultiShiftFunction.h ./algorithms/approx/Remez.h ./algorithms/approx/Zolotarev.h ./algorithms/CoarsenedMatrix.h ./algorithms/iterative/ConjugateGradient.h ./algorithms/iterative/ConjugateGradientMultiShift.h ./algorithms/iterative/ConjugateResidual.h ./algorithms/iterative/NormalEquations.h ./algorithms/iterative/SchurRedBlack.h ./algorithms/LinearOperator.h ./algorithms/SparseMatrix.h ./Algorithms.h ./AlignedAllocator.h ./cartesian/Cartesian_base.h ./cartesian/Cartesian_full.h ./cartesian/Cartesian_red_black.h ./Cartesian.h ./communicator/Communicator_base.h ./Communicator.h ./cshift/Cshift_common.h ./cshift/Cshift_mpi.h ./cshift/Cshift_none.h ./Cshift.h ./Grid.h ./GridConfig.h ./lattice/Lattice_arith.h ./lattice/Lattice_base.h ./lattice/Lattice_comparison.h ./lattice/Lattice_comparison_utils.h ./lattice/Lattice_conformable.h ./lattice/Lattice_coordinate.h ./lattice/Lattice_ET.h ./lattice/Lattice_local.h ./lattice/Lattice_overload.h ./lattice/Lattice_peekpoke.h ./lattice/Lattice_reality.h ./lattice/Lattice_reduction.h ./lattice/Lattice_rng.h ./lattice/Lattice_trace.h ./lattice/Lattice_transfer.h ./lattice/Lattice_transpose.h ./lattice/Lattice_unary.h ./lattice/Lattice_where.h ./Lattice.h ./parallelIO/NerscIO.h ./qcd/action/Actions.h ./qcd/action/DiffAction.h ./qcd/action/fermion/CayleyFermion5D.h ./qcd/action/fermion/ContinuedFractionFermion5D.h ./qcd/action/fermion/DomainWallFermion.h ./qcd/action/fermion/FermionOperator.h ./qcd/action/fermion/g5HermitianLinop.h ./qcd/action/fermion/MobiusFermion.h ./qcd/action/fermion/MobiusZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h ./qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonContfracTanhFermion.h ./qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h ./qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h ./qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h ./qcd/action/fermion/PartialFractionFermion5D.h ./qcd/action/fermion/ScaledShamirFermion.h ./qcd/action/fermion/ShamirZolotarevFermion.h ./qcd/action/fermion/WilsonCompressor.h ./qcd/action/fermion/WilsonFermion.h ./qcd/action/fermion/WilsonFermion5D.h ./qcd/action/fermion/WilsonKernels.h ./qcd/action/gauge/GaugeActionBase.h ./qcd/action/gauge/WilsonGaugeAction.h ./qcd/QCD.h ./qcd/spin/Dirac.h ./qcd/spin/TwoSpinor.h ./qcd/utils/CovariantCshift.h ./qcd/utils/LinalgUtils.h ./qcd/utils/SpaceTimeGrid.h ./qcd/utils/WilsonLoops.h ./simd/Grid_avx.h ./simd/Grid_avx512.h ./simd/Grid_empty.h ./simd/Grid_neon.h ./simd/Grid_qpx.h ./simd/Grid_sse4.h ./simd/Grid_vector_types.h ./simd/Grid_vector_unops.h ./simd/Old/Grid_vComplexD.h ./simd/Old/Grid_vComplexF.h ./simd/Old/Grid_vInteger.h ./simd/Old/Grid_vRealD.h ./simd/Old/Grid_vRealF.h ./Simd.h ./stencil/Lebesgue.h ./Stencil.h ./tensors/Tensor_arith.h ./tensors/Tensor_arith_add.h ./tensors/Tensor_arith_mac.h ./tensors/Tensor_arith_mul.h ./tensors/Tensor_arith_scalar.h ./tensors/Tensor_arith_sub.h ./tensors/Tensor_class.h ./tensors/Tensor_extract_merge.h ./tensors/Tensor_inner.h ./tensors/Tensor_outer.h ./tensors/Tensor_peek.h ./tensors/Tensor_poke.h ./tensors/Tensor_reality.h ./tensors/Tensor_Ta.h ./tensors/Tensor_trace.h ./tensors/Tensor_traits.h ./tensors/Tensor_transpose.h ./tensors/Tensor_unary.h ./Tensors.h ./Threads.h
 
 CCFILES=./algorithms/approx/MultiShiftFunction.cc ./algorithms/approx/Remez.cc ./algorithms/approx/Zolotarev.cc ./GridInit.cc ./qcd/action/fermion/CayleyFermion5D.cc ./qcd/action/fermion/ContinuedFractionFermion5D.cc ./qcd/action/fermion/PartialFractionFermion5D.cc ./qcd/action/fermion/WilsonFermion.cc ./qcd/action/fermion/WilsonFermion5D.cc ./qcd/action/fermion/WilsonKernels.cc ./qcd/action/fermion/WilsonKernelsHand.cc ./qcd/spin/Dirac.cc ./qcd/utils/SpaceTimeGrid.cc ./stencil/Lebesgue.cc ./stencil/Stencil_common.cc

lib/simd/Grid_avx.h

@@ -4,7 +4,7 @@
 
   Using intrinsics
 */
-// Time-stamp: <2015-05-29 14:13:30 neo>
+// Time-stamp: <2015-06-09 14:26:59 neo>
 //----------------------------------------------------------------------
 
 #include <immintrin.h>
@@ -383,6 +383,12 @@ namespace Grid {
       _mm_prefetch(ptr+i+512,_MM_HINT_T0);
     }
   }
+  inline void prefetch_HINT_T0(const char *ptr){
+    _mm_prefetch(ptr,_MM_HINT_T0);
+  }
+
+
+
   template < typename VectorSIMD > 
     inline void Gpermute(VectorSIMD &y,const VectorSIMD &b, int perm ) {
     Optimization::permute(y.v,b.v,perm);

lib/simd/Grid_avx512.h

@@ -4,7 +4,7 @@
 
   Using intrinsics
 */
-// Time-stamp: <2015-05-27 12:08:50 neo>
+// Time-stamp: <2015-06-09 14:27:28 neo>
 //----------------------------------------------------------------------
 
 #include <immintrin.h>
@@ -309,6 +309,12 @@ namespace Grid {
       _mm_prefetch(ptr+i+512,_MM_HINT_T0);
     }
   }
+  inline void prefetch_HINT_T0(const char *ptr){
+    _mm_prefetch(ptr,_MM_HINT_T0);
+  }
+
+
+
 
   // Gpermute utilities consider coalescing into 1 Gpermute
   template < typename VectorSIMD > 

lib/simd/Grid_empty.h

@@ -0,0 +1,289 @@
+//----------------------------------------------------------------------
+/*! @file Grid_sse4.h
+  @brief Empty Optimization libraries for debugging
+
+  Using intrinsics
+*/
+// Time-stamp: <2015-06-09 14:28:02 neo>
+//----------------------------------------------------------------------
+
+namespace Optimization {
+
+  template<class vtype>
+  union uconv {
+    float f;
+    vtype v;
+  };
+
+  union u128f {
+    float v;
+    float f[4];
+  };
+  union u128d {
+    double v;
+    double f[2];
+  };
+  
+  struct Vsplat{
+    //Complex float
+    inline float operator()(float a, float b){
+      return 0;
+    }
+    // Real float
+    inline float operator()(float a){
+      return 0;
+    }
+    //Complex double
+    inline double operator()(double a, double b){
+      return 0;
+    }
+    //Real double
+    inline double operator()(double a){
+      return 0;
+    }
+    //Integer
+    inline int operator()(Integer a){
+      return 0;
+    }
+  };
+
+  struct Vstore{
+    //Float 
+    inline void operator()(float a, float* F){
+      
+    }
+    //Double
+    inline void operator()(double a, double* D){
+     
+    }
+    //Integer
+    inline void operator()(int a, Integer* I){
+      
+    }
+
+  };
+
+  struct Vstream{
+    //Float
+    inline void operator()(float * a, float b){
+     
+    }
+    //Double
+    inline void operator()(double * a, double b){
+     
+    }
+
+
+  };
+
+  struct Vset{
+    // Complex float 
+    inline float operator()(Grid::ComplexF *a){
+      return 0;
+    }
+    // Complex double 
+    inline double operator()(Grid::ComplexD *a){
+      return 0;
+    }
+    // Real float 
+    inline float operator()(float *a){
+      return  0;
+    }
+    // Real double
+    inline double operator()(double *a){
+      return 0;
+    }
+    // Integer
+    inline int operator()(Integer *a){
+      return 0;
+    }
+
+
+  };
+
+  template <typename Out_type, typename In_type>
+  struct Reduce{
+    //Need templated class to overload output type
+    //General form must generate error if compiled
+    inline Out_type operator()(In_type in){
+      printf("Error, using wrong Reduce function\n");
+      exit(1);
+      return 0;
+    }
+  };
+
+  /////////////////////////////////////////////////////
+  // Arithmetic operations
+  /////////////////////////////////////////////////////
+  struct Sum{
+    //Complex/Real float
+    inline float operator()(float a, float b){
+      return 0;
+    }
+    //Complex/Real double
+    inline double operator()(double a, double b){
+      return 0;
+    }
+    //Integer
+    inline int operator()(int a, int b){
+      return 0;
+    }
+  };
+
+  struct Sub{
+    //Complex/Real float
+    inline float operator()(float a, float b){
+      return 0;
+    }
+    //Complex/Real double
+    inline double operator()(double a, double b){
+      return 0;
+    }
+    //Integer
+    inline int operator()(int a, int b){
+      return 0;
+    }
+  };
+
+  struct MultComplex{
+    // Complex float
+    inline float operator()(float a, float b){
+      return 0;
+    }
+    // Complex double
+    inline double operator()(double a, double b){
+      return 0;
+    }
+  };
+
+  struct Mult{
+    // Real float
+    inline float operator()(float a, float b){
+      return 0;
+    }
+    // Real double
+    inline double operator()(double a, double b){
+      return 0;
+    }
+    // Integer
+    inline int operator()(int a, int b){
+      return 0;
+    }
+  };
+
+  struct Conj{
+    // Complex single
+    inline float operator()(float in){
+      return 0;
+    }
+    // Complex double
+    inline double operator()(double in){
+      return 0;
+    }
+    // do not define for integer input
+  };
+
+  struct TimesMinusI{
+    //Complex single
+    inline float operator()(float in, float ret){
+      return 0;
+    }
+    //Complex double
+    inline double operator()(double in, double ret){
+      return 0;
+    }
+
+
+  };
+
+  struct TimesI{
+    //Complex single
+    inline float operator()(float in, float ret){
+      return 0;
+    }
+    //Complex double
+    inline double operator()(double in, double ret){
+      return 0;
+    }
+  };
+
+  //////////////////////////////////////////////
+  // Some Template specialization
+  template < typename vtype > 
+    void permute(vtype &a, vtype b, int perm) {
+   }; 
+
+  //Complex float Reduce
+  template<>
+  inline Grid::ComplexF Reduce<Grid::ComplexF, float>::operator()(float in){
+    return 0;
+  }
+  //Real float Reduce
+  template<>
+  inline Grid::RealF Reduce<Grid::RealF, float>::operator()(float in){
+    return 0;
+  }
+  
+  
+  //Complex double Reduce
+  template<>
+  inline Grid::ComplexD Reduce<Grid::ComplexD, double>::operator()(double in){
+    return 0;
+  }
+  
+  //Real double Reduce
+  template<>
+  inline Grid::RealD Reduce<Grid::RealD, double>::operator()(double in){
+    return 0;
+  }
+
+  //Integer Reduce
+  template<>
+  inline Integer Reduce<Integer, int>::operator()(int in){
+    // FIXME unimplemented
+   printf("Reduce : Missing integer implementation -> FIX\n");
+    assert(0);
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+// Here assign types 
+namespace Grid {
+
+  typedef float SIMD_Ftype;  // Single precision type
+  typedef double SIMD_Dtype; // Double precision type
+  typedef int SIMD_Itype; // Integer type
+
+  // prefetch utilities
+  inline void v_prefetch0(int size, const char *ptr){};
+  inline void prefetch_HINT_T0(const char *ptr){};
+
+
+
+  // Gpermute function
+  template < typename VectorSIMD > 
+    inline void Gpermute(VectorSIMD &y,const VectorSIMD &b, int perm ) {
+    Optimization::permute(y.v,b.v,perm);
+  }
+
+
+  // Function name aliases
+  typedef Optimization::Vsplat   VsplatSIMD;
+  typedef Optimization::Vstore   VstoreSIMD;
+  typedef Optimization::Vset     VsetSIMD;
+  typedef Optimization::Vstream  VstreamSIMD;
+  template <typename S, typename T> using ReduceSIMD = Optimization::Reduce<S,T>;
+
+ 
+
+
+  // Arithmetic operations
+  typedef Optimization::Sum         SumSIMD;
+  typedef Optimization::Sub         SubSIMD;
+  typedef Optimization::Mult        MultSIMD;
+  typedef Optimization::MultComplex MultComplexSIMD;
+  typedef Optimization::Conj        ConjSIMD;
+  typedef Optimization::TimesMinusI TimesMinusISIMD;
+  typedef Optimization::TimesI      TimesISIMD;
+
+}

lib/simd/Grid_neon.h

@@ -0,0 +1,308 @@
+//----------------------------------------------------------------------
+/*! @file Grid_sse4.h
+  @brief Optimization libraries for NEON (ARM) instructions set ARMv7
+
+  Experimental - Using intrinsics - DEVELOPING! 
+*/
+// Time-stamp: <2015-06-09 15:25:40 neo>
+//----------------------------------------------------------------------
+
+#include <arm_neon.h>
+
+namespace Optimization {
+
+  template<class vtype>
+  union uconv {
+    float32x4_t f;
+    vtype v;
+  };
+
+  union u128f {
+    float32x4_t v;
+    float f[4];
+  };
+  union u128d {
+    float32x4_t v;
+    float f[4];
+  };
+  
+  struct Vsplat{
+    //Complex float
+    inline float32x4_t operator()(float a, float b){
+      float32x4_t foo;
+      return foo;
+    }
+    // Real float
+    inline float32x4_t operator()(float a){
+      float32x4_t foo;
+      return foo;
+    }
+    //Complex double
+    inline float32x4_t operator()(double a, double b){
+      float32x4_t foo;
+      return foo;
+    }
+    //Real double
+    inline float32x4_t operator()(double a){
+      float32x4_t foo;
+      return foo;
+    }
+    //Integer
+    inline uint32x4_t operator()(Integer a){
+      uint32x4_t foo;
+      return foo;
+    }
+  };
+
+  struct Vstore{
+    //Float 
+    inline void operator()(float32x4_t a, float* F){
+      
+    }
+    //Double
+    inline void operator()(float32x4_t a, double* D){
+      
+    }
+    //Integer
+    inline void operator()(uint32x4_t a, Integer* I){
+     
+    }
+
+  };
+
+  struct Vstream{
+    //Float
+    inline void operator()(float * a, float32x4_t b){
+    
+    }
+    //Double
+    inline void operator()(double * a, float32x4_t b){
+  
+    }
+
+
+  };
+
+  struct Vset{
+    // Complex float 
+    inline float32x4_t operator()(Grid::ComplexF *a){
+      float32x4_t foo;
+      return foo;
+    }
+    // Complex double 
+    inline float32x4_t operator()(Grid::ComplexD *a){
+      float32x4_t foo;
+      return foo;
+    }
+    // Real float 
+    inline float32x4_t operator()(float *a){
+      float32x4_t foo;
+      return foo;
+    }
+    // Real double
+    inline float32x4_t operator()(double *a){
+      float32x4_t foo;
+      return foo;
+    }
+    // Integer
+    inline uint32x4_t operator()(Integer *a){
+      uint32x4_t foo;
+      return foo;
+    }
+
+
+  };
+
+  template <typename Out_type, typename In_type>
+  struct Reduce{
+    //Need templated class to overload output type
+    //General form must generate error if compiled
+    inline Out_type operator()(In_type in){
+      printf("Error, using wrong Reduce function\n");
+      exit(1);
+      return 0;
+    }
+  };
+
+  /////////////////////////////////////////////////////
+  // Arithmetic operations
+  /////////////////////////////////////////////////////
+  struct Sum{
+    //Complex/Real float
+    inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+      float32x4_t foo;
+      return foo;
+    }
+    //Complex/Real double
+    //inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+    //  float32x4_t foo;
+    //  return foo;
+    //}
+    //Integer
+    inline uint32x4_t operator()(uint32x4_t a, uint32x4_t b){
+      uint32x4_t foo;
+      return foo;
+    }
+  };
+
+  struct Sub{
+    //Complex/Real float
+    inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+      float32x4_t foo;
+      return foo;
+    }
+    //Complex/Real double
+    //inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+    //  float32x4_t foo;
+    //  return foo;
+    //}
+    //Integer
+    inline uint32x4_t operator()(uint32x4_t a, uint32x4_t b){
+      uint32x4_t foo;
+      return foo;
+    }
+  };
+
+  struct MultComplex{
+    // Complex float
+    inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+      float32x4_t foo;
+      return foo;
+    }
+    // Complex double
+    //inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+    //  float32x4_t foo;
+    //  return foo;
+    //}
+  };
+
+  struct Mult{
+    // Real float
+    inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+      return a;
+    }
+    // Real double
+    //inline float32x4_t operator()(float32x4_t a, float32x4_t b){
+    //  return 0;
+    //}
+    // Integer
+    inline uint32x4_t operator()(uint32x4_t a, uint32x4_t b){
+      return a;
+    }
+  };
+
+  struct Conj{
+    // Complex single
+    inline float32x4_t operator()(float32x4_t in){
+      return in;
+    }
+    // Complex double
+    //inline float32x4_t operator()(float32x4_t in){
+    // return 0;
+    //}
+    // do not define for integer input
+  };
+
+  struct TimesMinusI{
+    //Complex single
+    inline float32x4_t operator()(float32x4_t in, float32x4_t ret){
+      return in;
+    }
+    //Complex double
+    //inline float32x4_t operator()(float32x4_t in, float32x4_t ret){
+    //  return in;
+    //}
+
+
+  };
+
+  struct TimesI{
+    //Complex single
+    inline float32x4_t operator()(float32x4_t in, float32x4_t ret){
+      return in;
+    }
+    //Complex double
+    //inline float32x4_t operator()(float32x4_t in, float32x4_t ret){
+    //  return 0;
+    //}
+  };
+
+  //////////////////////////////////////////////
+  // Some Template specialization
+  template < typename vtype > 
+    void permute(vtype &a, vtype b, int perm) {
+
+  }; 
+
+  //Complex float Reduce
+  template<>
+  inline Grid::ComplexF Reduce<Grid::ComplexF, float32x4_t>::operator()(float32x4_t in){
+    return 0;
+  }
+  //Real float Reduce
+  template<>
+  inline Grid::RealF Reduce<Grid::RealF, float32x4_t>::operator()(float32x4_t in){
+    return 0;
+  }
+  
+  
+  //Complex double Reduce
+  template<>
+  inline Grid::ComplexD Reduce<Grid::ComplexD, float32x4_t>::operator()(float32x4_t in){
+    return 0;
+  }
+  
+  //Real double Reduce
+  template<>
+  inline Grid::RealD Reduce<Grid::RealD, float32x4_t>::operator()(float32x4_t in){
+    return 0;
+  }
+
+  //Integer Reduce
+  template<>
+  inline Integer Reduce<Integer, uint32x4_t>::operator()(uint32x4_t in){
+    // FIXME unimplemented
+   printf("Reduce : Missing integer implementation -> FIX\n");
+    assert(0);
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+// Here assign types 
+namespace Grid {
+
+  typedef float32x4_t  SIMD_Ftype; // Single precision type
+  typedef float32x4_t  SIMD_Dtype; // Double precision type - no double on ARMv7
+  typedef uint32x4_t   SIMD_Itype; // Integer type
+
+  inline void v_prefetch0(int size, const char *ptr){};  // prefetch utilities
+  inline void prefetch_HINT_T0(const char *ptr){};
+
+
+  // Gpermute function
+  template < typename VectorSIMD > 
+    inline void Gpermute(VectorSIMD &y,const VectorSIMD &b, int perm ) {
+    Optimization::permute(y.v,b.v,perm);
+  }
+
+
+  // Function name aliases
+  typedef Optimization::Vsplat   VsplatSIMD;
+  typedef Optimization::Vstore   VstoreSIMD;
+  typedef Optimization::Vset     VsetSIMD;
+  typedef Optimization::Vstream  VstreamSIMD;
+  template <typename S, typename T> using ReduceSIMD = Optimization::Reduce<S,T>;
+
+ 
+
+
+  // Arithmetic operations
+  typedef Optimization::Sum         SumSIMD;
+  typedef Optimization::Sub         SubSIMD;
+  typedef Optimization::Mult        MultSIMD;
+  typedef Optimization::MultComplex MultComplexSIMD;
+  typedef Optimization::Conj        ConjSIMD;
+  typedef Optimization::TimesMinusI TimesMinusISIMD;
+  typedef Optimization::TimesI      TimesISIMD;
+
+}

lib/simd/Grid_sse4.h

@@ -4,7 +4,7 @@
 
   Using intrinsics
 */
-// Time-stamp: <2015-05-27 12:02:07 neo>
+// Time-stamp: <2015-06-09 14:24:01 neo>
 //----------------------------------------------------------------------
 
 #include <pmmintrin.h>
@@ -297,7 +297,12 @@ namespace Grid {
   typedef __m128d SIMD_Dtype; // Double precision type
   typedef __m128i SIMD_Itype; // Integer type
 
-  inline void v_prefetch0(int size, const char *ptr){};  // prefetch utilities
+  // prefetch utilities
+  inline void v_prefetch0(int size, const char *ptr){};
+  inline void prefetch_HINT_T0(const char *ptr){
+    _mm_prefetch(ptr,_MM_HINT_T0);
+  }
+  
 
   // Gpermute function
   template < typename VectorSIMD > 

lib/simd/Grid_vector_types.h

@@ -2,11 +2,14 @@
 /*! @file Grid_vector_types.h
   @brief Defines templated class Grid_simd to deal with inner vector types
 */
-// Time-stamp: <2015-05-29 14:19:48 neo>
+// Time-stamp: <2015-06-09 15:00:47 neo>
 //---------------------------------------------------------------------------
 #ifndef GRID_VECTOR_TYPES
 #define GRID_VECTOR_TYPES
 
+#ifdef EMPTY_SIMD
+#include "Grid_empty.h"
+#endif
 #ifdef SSE4
 #include "Grid_sse4.h"
 #endif
@@ -19,6 +22,9 @@
 #if defined QPX
 #include "Grid_qpx.h"
 #endif
+#ifdef NEONv7
+#include "Grid_neon.h"
+#endif
 
 namespace Grid {
 
@@ -152,7 +158,7 @@ namespace Grid {
     ///////////////////////
     friend inline void vprefetch(const Grid_simd &v)
     {
-      _mm_prefetch((const char*)&v.v,_MM_HINT_T0);
+      prefetch_HINT_T0((const char*)&v.v);
     }
 
     ///////////////////////

scripts/arm_configure.experimental

@@ -0,0 +1 @@
+./configure --host=arm-linux-gnueabihf  CXX=clang++-3.5 CXXFLAGS='-std=c++11 -O3 -target arm-linux-gnueabihf -I/usr/arm-linux-gnueabihf/include/ -I/home/neo/Codes/gmp6.0/gmp-arm/include/ -I/usr/arm-linux-gnueabihf/include/c++/4.8.2/arm-linux-gnueabihf/ -L/home/neo/Codes/gmp6.0/gmp-arm/lib/ -I/home/neo/Codes/mpfr3.1.2/mpfr-arm/include/ -L/home/neo/Codes/mpfr3.1.2/mpfr-arm/lib/ -static -mcpu=cortex-a7' --enable-simd=NEONv7