From 98f931827994f61b36d897dfaadb1816e558fece Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Tue, 28 Mar 2017 23:16:04 +0900
Subject: [PATCH] Build on AVX2 and MPI passing with clang++

---
 lib/qcd/action/fermion/StaggeredKernels.cc | 4 +++-
 tests/core/Test_staggered5D.cc             | 2 +-
 tests/core/Test_staggered5Dvec.cc          | 9 +++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/qcd/action/fermion/StaggeredKernels.cc b/lib/qcd/action/fermion/StaggeredKernels.cc
index 01a55efe..b6ec14c7 100644
--- a/lib/qcd/action/fermion/StaggeredKernels.cc
+++ b/lib/qcd/action/fermion/StaggeredKernels.cc
@@ -31,7 +31,7 @@ directory
 namespace Grid {
 namespace QCD {
 
-int StaggeredKernelsStatic::Opt;
+int StaggeredKernelsStatic::Opt= StaggeredKernelsStatic::OptGeneric;
 
 template <class Impl>
 StaggeredKernels<Impl>::StaggeredKernels(const ImplParams &p) : Base(p){};
@@ -215,6 +215,7 @@ void StaggeredKernels<Impl>::DhopSiteDag(StencilImpl &st, LebesgueOrder &lo, Dou
      }
     break;
   default:
+    std::cout<<"Oops Opt = "<<Opt<<std::endl;
     assert(0);
     break;
   }
@@ -251,6 +252,7 @@ void StaggeredKernels<Impl>::DhopSite(StencilImpl &st, LebesgueOrder &lo, Double
     }
     break;
   default:
+    std::cout<<"Oops Opt = "<<Opt<<std::endl;
     assert(0);
     break;
   }
diff --git a/tests/core/Test_staggered5D.cc b/tests/core/Test_staggered5D.cc
index a7b00399..be31c438 100644
--- a/tests/core/Test_staggered5D.cc
+++ b/tests/core/Test_staggered5D.cc
@@ -153,7 +153,7 @@ int main (int argc, char ** argv)
   std::cout<<GridLogMessage<<"=========================================================="<<std::endl;
 
   std::cout<<GridLogMessage << "Calling Ds"<<std::endl;
-  int ncall=100000;
+  int ncall=1000;
   double t0=usecond();
   for(int i=0;i<ncall;i++){
     Ds.Dhop(src,result,0);
diff --git a/tests/core/Test_staggered5Dvec.cc b/tests/core/Test_staggered5Dvec.cc
index ef215ed4..db76f792 100644
--- a/tests/core/Test_staggered5Dvec.cc
+++ b/tests/core/Test_staggered5Dvec.cc
@@ -128,7 +128,12 @@ int main (int argc, char ** argv)
 
   std::cout<<GridLogMessage << "Calling vectorised staggered operator"<<std::endl;
 
+#ifdef AVX512
   QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
+#else
+  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
+#endif
+
   t0=usecond();
   for(int i=0;i<ncall1;i++){
     Ds.Dhop(src,tmp,0);
@@ -159,7 +164,11 @@ int main (int argc, char ** argv)
   std::cout<<GridLogMessage << "mflop/s =   "<< flops/(t1-t0)<<std::endl;
 
 
+#ifdef AVX512
   QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
+#else
+  QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
+#endif
 
   err = tmp-result; 
   std::cout<<GridLogMessage << "norm diff   "<< norm2(err)<<std::endl;