From be3a8249c6f2b628bda6fa4258ca4b4ffac139a5 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Thu, 16 Feb 2017 23:51:15 +0000
Subject: [PATCH 1/4] Faster gather

---
 lib/Stencil.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Stencil.h b/lib/Stencil.h
index 8b5eac2d..00c9f7aa 100644
--- a/lib/Stencil.h
+++ b/lib/Stencil.h
@@ -240,6 +240,10 @@ PARALLEL_FOR_LOOP
         for(int o=0;o<Mergers[i].buffer_size/2;o++){
 	  exchange(Mergers[i].mpointer[2*o],Mergers[i].mpointer[2*o+1],
 		   Mergers[i].vpointers[0][o],Mergers[i].vpointers[1][o],Mergers[i].type);
+	  //	  cobj temp1,temp2;
+	  //	  exchange(temp1,temp2,Mergers[i].vpointers[0][o],Mergers[i].vpointers[1][o],Mergers[i].type);
+	  //	  vstream(Mergers[i].mpointer[2*o],temp1);
+	  //	  vstream(Mergers[i].mpointer[2*o+1],temp2);
 	}
       }
       mergetime+=usecond();
@@ -1037,9 +1041,7 @@ PARALLEL_FOR_LOOP
 	
 	int sx   = (x+sshift)%rd;
 	
-	gathermtime-=usecond();
-	Gather_plane_exchange(rhs,spointers,dimension,sx,cbmask,compress,permute_type);
-	gathermtime+=usecond();
+	gathermtime+=Gather_plane_exchange(rhs,spointers,dimension,sx,cbmask,compress,permute_type);
 
 	//spointers[0] -- low
 	//spointers[1] -- high

From 5c0adf7bf2248d1de1fc60c7c2ae57a6fa1b3aab Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Thu, 16 Feb 2017 23:51:33 +0000
Subject: [PATCH 2/4] Make clang happy with parenthesis

---
 lib/communicator/Communicator_mpi3.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/communicator/Communicator_mpi3.cc b/lib/communicator/Communicator_mpi3.cc
index b86d5259..23626c5b 100644
--- a/lib/communicator/Communicator_mpi3.cc
+++ b/lib/communicator/Communicator_mpi3.cc
@@ -100,7 +100,7 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
 
   int flag;
   int provided;
-  mtrace();
+  //  mtrace();
 
   MPI_Initialized(&flag); // needed to coexist with other libs apparently
   if ( !flag ) {
@@ -511,7 +511,7 @@ void CartesianCommunicator::SendToRecvFromBegin(std::vector<CommsRequest_t> &lis
   int myrank = _processor;
   int ierr;
 
-  if ( (CommunicatorPolicy == CommunicatorPolicyIsend) ) { 
+  if ( CommunicatorPolicy == CommunicatorPolicyIsend ) { 
     MPI_Request xrq;
     MPI_Request rrq;
 

From 8a29c16bdef4ff0907c400c200751887cf4a16fb Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Thu, 16 Feb 2017 23:52:22 +0000
Subject: [PATCH 3/4] Faster gather exchange

---
 lib/cshift/Cshift_common.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/cshift/Cshift_common.h b/lib/cshift/Cshift_common.h
index c01187de..e2fa0481 100644
--- a/lib/cshift/Cshift_common.h
+++ b/lib/cshift/Cshift_common.h
@@ -142,12 +142,12 @@ PARALLEL_NESTED_LOOP2
 ///////////////////////////////////////////////////////////////////
 // Gather for when there *is* need to SIMD split with compression
 ///////////////////////////////////////////////////////////////////
-template<class cobj,class vobj,class compressor> void 
+template<class cobj,class vobj,class compressor> double
 Gather_plane_exchange(const Lattice<vobj> &rhs,
 		      std::vector<cobj *> pointers,int dimension,int plane,int cbmask,compressor &compress,int type)
 {
   int rd = rhs._grid->_rdimensions[dimension];
-
+  double t1,t2;
   if ( !rhs._grid->CheckerBoarded(dimension) ) {
     cbmask = 0x3;
   }
@@ -186,13 +186,20 @@ Gather_plane_exchange(const Lattice<vobj> &rhs,
   }
 
   assert( (table.size()&0x1)==0);
+  t1=usecond();
 PARALLEL_FOR_LOOP     
   for(int j=0;j<table.size()/2;j++){
     //    buffer[off+table[i].first]=compress(rhs._odata[so+table[i].second]);
     cobj temp1 =compress(rhs._odata[so+table[2*j].second]);
     cobj temp2 =compress(rhs._odata[so+table[2*j+1].second]);
-    exchange(pointers[0][j],pointers[1][j],temp1,temp2,type);
+    cobj temp3;
+    cobj temp4;
+    exchange(temp3,temp4,temp1,temp2,type);
+    vstream(pointers[0][j],temp3);
+    vstream(pointers[1][j],temp4);
   }
+  t2=usecond();
+ return t2-t1;
 }
 
 //////////////////////////////////////////////////////

From f246fe3304a5ecb03db67b4cd069f2ca4f26c5f1 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Thu, 16 Feb 2017 23:52:44 +0000
Subject: [PATCH 4/4] Improvements to avx for invertible to avoid latent bug

---
 lib/simd/Grid_avx.h | 19 +++++++++++++++++--
 tests/Test_simd.cc  |  6 ++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h
index 7abe4d5a..2dbe26f4 100644
--- a/lib/simd/Grid_avx.h
+++ b/lib/simd/Grid_avx.h
@@ -474,16 +474,31 @@ namespace Optimization {
   struct Exchange{
     // 3210 ordering
     static inline void Exchange0(__m256 &out1,__m256 &out2,__m256 in1,__m256 in2){
+      //Invertible
+      //AB CD ->  AC BD
+      //AC BD ->  AB CD
       out1= _mm256_permute2f128_ps(in1,in2,0x20);
       out2= _mm256_permute2f128_ps(in1,in2,0x31);
     };
     static inline void Exchange1(__m256 &out1,__m256 &out2,__m256 in1,__m256 in2){
+      //Invertible
+      // ABCD EFGH  ->ABEF CDGH
+      // ABEF CDGH  ->ABCD EFGH
       out1= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(1,0,1,0));
       out2= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(3,2,3,2));
     };
     static inline void Exchange2(__m256 &out1,__m256 &out2,__m256 in1,__m256 in2){
-      out1= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(2,0,2,0));
-      out2= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(3,1,3,1));
+      // Invertible ? 
+      // ABCD EFGH -> ACEG BDFH
+      // ACEG BDFH -> AEBF CGDH
+      //      out1= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(2,0,2,0));
+      //      out2= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(3,1,3,1));
+      // Bollocks; need 
+      // AECG BFDH -> ABCD EFGH
+      out1= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(2,0,2,0)); /*ACEG*/
+      out2= _mm256_shuffle_ps(in1,in2,_MM_SELECT_FOUR_FOUR(3,1,3,1)); /*BDFH*/
+      out1= _mm256_shuffle_ps(out1,out1,_MM_SELECT_FOUR_FOUR(3,1,2,0)); /*AECG*/
+      out2= _mm256_shuffle_ps(out2,out2,_MM_SELECT_FOUR_FOUR(3,1,2,0)); /*AECG*/
     };
     static inline void Exchange3(__m256 &out1,__m256 &out2,__m256 in1,__m256 in2){
       assert(0);
diff --git a/tests/Test_simd.cc b/tests/Test_simd.cc
index d840140e..b94febb5 100644
--- a/tests/Test_simd.cc
+++ b/tests/Test_simd.cc
@@ -419,8 +419,10 @@ void ExchangeTester(const functor &func)
     assert(found==1);
   }
 
-  //  for(int i=0;i<Nsimd;i++){
-    //    std::cout << " i "<< i<<" test1"<<test1[i]<<" "<<input1[i]<<std::endl;
+  for(int i=0;i<Nsimd;i++){
+    assert(test1[i]==input1[i]);
+    assert(test2[i]==input2[i]);
+  }//    std::cout << " i "<< i<<" test1"<<test1[i]<<" "<<input1[i]<<std::endl;
     //    std::cout << " i "<< i<<" test2"<<test2[i]<<" "<<input2[i]<<std::endl;
   //  }
 }