From ff2f559a574d41b73d28fc5341336750ebe0b6aa Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Tue, 27 Dec 2016 17:45:19 +0000
Subject: [PATCH 1/3] Remove inline on gather optimised path

---
 lib/Stencil.h | 55 +++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/lib/Stencil.h b/lib/Stencil.h
index 96b40c50..82e818d2 100644
--- a/lib/Stencil.h
+++ b/lib/Stencil.h
@@ -70,51 +70,20 @@
 
 namespace Grid {
 
-inline void Gather_plane_simple_table_compute (GridBase *grid,int dimension,int plane,int cbmask,
-					       int off,std::vector<std::pair<int,int> > & table)
+void Gather_plane_simple_table_compute (GridBase *grid,int dimension,int plane,int cbmask,
+					int off,std::vector<std::pair<int,int> > & table);
+
+template<class vobj,class cobj,class compressor> 
+void Gather_plane_simple_table (std::vector<std::pair<int,int> >& table,const Lattice<vobj> &rhs,cobj *buffer,compressor &compress, int off,int so)   __attribute__((noinline));
+
+template<class vobj,class cobj,class compressor> 
+void Gather_plane_simple_table (std::vector<std::pair<int,int> >& table,const Lattice<vobj> &rhs,cobj *buffer,compressor &compress, int off,int so)
 {
-  table.resize(0);
-  int rd = grid->_rdimensions[dimension];
-
-  if ( !grid->CheckerBoarded(dimension) ) {
-    cbmask = 0x3;
+  int num=table.size();
+  PARALLEL_FOR_LOOP     
+  for(int i=0;i<num;i++){
+    vstream(buffer[off+table[i].first],compress(rhs._odata[so+table[i].second]));
   }
-  int so= plane*grid->_ostride[dimension]; // base offset for start of plane 
-  int e1=grid->_slice_nblock[dimension];
-  int e2=grid->_slice_block[dimension];
-
-  int stride=grid->_slice_stride[dimension];
-  if ( cbmask == 0x3 ) { 
-    table.resize(e1*e2);
-    for(int n=0;n<e1;n++){
-      for(int b=0;b<e2;b++){
-	int o  = n*stride;
-	int bo = n*e2;
-	table[bo+b]=std::pair<int,int>(bo+b,o+b);
-      }
-    }
-  } else { 
-     int bo=0;
-     table.resize(e1*e2/2);
-     for(int n=0;n<e1;n++){
-       for(int b=0;b<e2;b++){
-	 int o  = n*stride;
-	 int ocb=1<<grid->CheckerBoardFromOindexTable(o+b);
-	 if ( ocb &cbmask ) {
-	   table[bo]=std::pair<int,int>(bo,o+b); bo++;
-	 }
-       }
-     }
-  }
-}
-
-template<class vobj,class cobj,class compressor> void 
-Gather_plane_simple_table (std::vector<std::pair<int,int> >& table,const Lattice<vobj> &rhs,cobj *buffer,compressor &compress, int off,int so)
-{
-PARALLEL_FOR_LOOP     
-     for(int i=0;i<table.size();i++){
-       vstream(buffer[off+table[i].first],compress(rhs._odata[so+table[i].second]));
-     }
 }
 
 struct StencilEntry { 

From 669cfca9b741407a8e3317a0315e29a040674cae Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Tue, 27 Dec 2016 17:45:40 +0000
Subject: [PATCH 2/3] No inline

---
 lib/Stencil.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 lib/Stencil.cc

diff --git a/lib/Stencil.cc b/lib/Stencil.cc
new file mode 100644
index 00000000..16fb736f
--- /dev/null
+++ b/lib/Stencil.cc
@@ -0,0 +1,69 @@
+   /*************************************************************************************
+
+     Grid physics library, www.github.com/paboyle/Grid 
+
+     Source file: ./lib/Stencil.cc
+
+     Copyright (C) 2015
+
+ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     with this program; if not, write to the Free Software Foundation, Inc.,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+     See the full license in the file "LICENSE" in the top level distribution directory
+     *************************************************************************************/
+     /*  END LEGAL */
+#include "Grid.h"
+
+namespace Grid {
+
+void Gather_plane_simple_table_compute (GridBase *grid,int dimension,int plane,int cbmask,
+					int off,std::vector<std::pair<int,int> > & table)
+{
+  table.resize(0);
+  int rd = grid->_rdimensions[dimension];
+
+  if ( !grid->CheckerBoarded(dimension) ) {
+    cbmask = 0x3;
+  }
+  int so= plane*grid->_ostride[dimension]; // base offset for start of plane 
+  int e1=grid->_slice_nblock[dimension];
+  int e2=grid->_slice_block[dimension];
+
+  int stride=grid->_slice_stride[dimension];
+  if ( cbmask == 0x3 ) { 
+    table.resize(e1*e2);
+    for(int n=0;n<e1;n++){
+      for(int b=0;b<e2;b++){
+	int o  = n*stride;
+	int bo = n*e2;
+	table[bo+b]=std::pair<int,int>(bo+b,o+b);
+      }
+    }
+  } else { 
+     int bo=0;
+     table.resize(e1*e2/2);
+     for(int n=0;n<e1;n++){
+       for(int b=0;b<e2;b++){
+	 int o  = n*stride;
+	 int ocb=1<<grid->CheckerBoardFromOindexTable(o+b);
+	 if ( ocb &cbmask ) {
+	   table[bo]=std::pair<int,int>(bo,o+b); bo++;
+	 }
+       }
+     }
+  }
+}
+}

From 1e179c903dc176487893456467b315f01c303d6e Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Tue, 27 Dec 2016 17:46:38 +0000
Subject: [PATCH 3/3] Worried about integer; suspect where statements are
 broken

---
 lib/simd/Grid_qpx.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/simd/Grid_qpx.h b/lib/simd/Grid_qpx.h
index e2fe0b63..fd897b9c 100644
--- a/lib/simd/Grid_qpx.h
+++ b/lib/simd/Grid_qpx.h
@@ -89,6 +89,7 @@ namespace Optimization {
       vec_st(a, 0, d);
     }
     //Integer
+    // PAB: fixme -- is this right ; just looks like scalar not vector
     inline void operator()(int a, Integer *i){
       i[0] = a;
     }