From 5aac6dc85b3b3efea76a94acbee578268efd94d2 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Thu, 16 Apr 2015 14:48:21 +0100
Subject: [PATCH] spin trace type work

---
 Grid_config.h.in |  4 ++--
 Makefile.in      |  6 +++---
 TODO             | 17 ++++++++++-------
 configure        |  6 +++---
 configure.ac     |  6 +++---
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Grid_config.h.in b/Grid_config.h.in
index 91948fa2..660edd5d 100644
--- a/Grid_config.h.in
+++ b/Grid_config.h.in
@@ -72,8 +72,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* SSE2 */
-#undef SSE2
+/* SSE4 */
+#undef SSE4
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
diff --git a/Makefile.in b/Makefile.in
index 11b86688..ce8b74be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,7 +158,7 @@ PROGRAMS = $(bin_PROGRAMS)
 am_Grid_main_OBJECTS = Grid_main.$(OBJEXT)
 Grid_main_OBJECTS = $(am_Grid_main_OBJECTS)
 Grid_main_DEPENDENCIES = libGrid.a
-am_test_Grid_stencil_OBJECTS = test_Grid_Stencil.$(OBJEXT)
+am_test_Grid_stencil_OBJECTS = test_Grid_stencil.$(OBJEXT)
 test_Grid_stencil_OBJECTS = $(am_test_Grid_stencil_OBJECTS)
 test_Grid_stencil_DEPENDENCIES = libGrid.a
 AM_V_P = $(am__v_P_@AM_V@)
@@ -370,7 +370,7 @@ include_HEADERS = Grid_config.h\
 
 Grid_main_SOURCES = Grid_main.cc
 Grid_main_LDADD = libGrid.a
-test_Grid_stencil_SOURCES = test_Grid_Stencil.cc
+test_Grid_stencil_SOURCES = test_Grid_stencil.cc
 test_Grid_stencil_LDADD = libGrid.a
 all: Grid_config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -523,7 +523,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_stencil_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Grid_Stencil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Grid_stencil.Po@am__quote@
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/TODO b/TODO
index 010a06b7..5f21f520 100644
--- a/TODO
+++ b/TODO
@@ -7,18 +7,16 @@ AUDITS:
 * extract / merge extra implementation removal      
 
 
+BUILD:
+* Test infrastructure
+* subdirs lib, tests ??
+
 FUNCTIONALITY:
-
 * Conditional execution, where etc...                -----DONE, simple test
-
 * Integer relational support                         -----DONE
-
 * Coordinate information, integers etc...            -----DONE
-
 * Integer type padding/union to vector.              -----DONE 
-
 * LatticeCoordinate[mu]                              -----DONE
-
 * Stencil operator support                           -----Initial thoughts, trial implementation DONE.
                                                      -----some simple tests that Stencil matches Cshift.
                                                      -----do all permute in comms phase, so that copy permute
@@ -27,6 +25,12 @@ FUNCTIONALITY:
 * CovariantShift support                             -----Use a class to store gauge field? (parallel transport?)
 
 
+POST-SFW call:
+
+* TraceColor, TraceSpin.
+* How to define simple matrix operations, such as flavour matrices?
+
+
 * Subset support, slice sums etc...                  -----Only need slice sum?
                                                      -----Generic cartesian subslicing?
                                                      -----Array ranges / boost extents?
@@ -34,7 +38,6 @@ FUNCTIONALITY:
                                                      -----Suggests generalised cartesian subblocking
                                                           sums, returning modified grid?
 					             -----What should interface be?
-
 i)  Two classes of subset;   red black parity subsetting (pick checkerboard).
                              cartesian sub-block subsetting
 
diff --git a/configure b/configure
index c6f93abc..1adf726f 100755
--- a/configure
+++ b/configure
@@ -5009,10 +5009,10 @@ fi
 
 
 case ${ac_SIMD} in
-     SSE2)
-       echo Configuring for SSE2
+     SSE4)
+       echo Configuring for SSE4
 
-$as_echo "#define SSE2 1" >>confdefs.h
+$as_echo "#define SSE4 1" >>confdefs.h
 
      ;;
      AVX)
diff --git a/configure.ac b/configure.ac
index bfe745e5..83405ca8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,9 @@ AC_CHECK_FUNCS([gettimeofday])
 AC_ARG_ENABLE([simd],[AC_HELP_STRING([--enable-simd=SSE|AVX|AVX2|AVX512],[Select instructions])],[ac_SIMD=${enable_simd}],[ac_SIMD=AVX2])
 
 case ${ac_SIMD} in
-     SSE2)
-       echo Configuring for SSE2
-       AC_DEFINE([SSE2],[1],[SSE2] )
+     SSE4)
+       echo Configuring for SSE4
+       AC_DEFINE([SSE4],[1],[SSE4] )
      ;;
      AVX)
        echo Configuring for AVX