From 4a1d4f1b3ca0af16d9746521fcc5f9279e7e5ad3 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Sat, 2 May 2015 17:52:36 +0100
Subject: [PATCH] Starting a benchmarking sub dir

---
 Makefile.am                          | 2 +-
 Makefile.in                          | 2 +-
 {tests => benchmarks}/Grid_wilson.cc | 0
 configure                            | 3 +++
 configure.ac                         | 1 +
 tests/Makefile.am                    | 5 +----
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename {tests => benchmarks}/Grid_wilson.cc (100%)

diff --git a/Makefile.am b/Makefile.am
index a55b2b92..fae10e5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 # additional include paths necessary to compile the C++ library
 AM_CXXFLAGS = -I$(top_srcdir)/
-SUBDIRS = lib tests
+SUBDIRS = lib tests benchmarks
 
diff --git a/Makefile.in b/Makefile.in
index 99b67fff..c9257ab2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,7 @@ top_srcdir = @top_srcdir@
 
 # additional include paths necessary to compile the C++ library
 AM_CXXFLAGS = -I$(top_srcdir)/
-SUBDIRS = lib tests
+SUBDIRS = lib tests benchmarks
 all: all-recursive
 
 .SUFFIXES:
diff --git a/tests/Grid_wilson.cc b/benchmarks/Grid_wilson.cc
similarity index 100%
rename from tests/Grid_wilson.cc
rename to benchmarks/Grid_wilson.cc
diff --git a/configure b/configure
index 6a6c4331..3d25f6a9 100755
--- a/configure
+++ b/configure
@@ -5174,6 +5174,8 @@ ac_config_files="$ac_config_files lib/Makefile"
 
 ac_config_files="$ac_config_files tests/Makefile"
 
+ac_config_files="$ac_config_files benchmarks/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -5916,6 +5918,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES benchmarks/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index ffd37d87..ce73ffd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,4 +80,5 @@ AM_CONDITIONAL(BUILD_COMMS_NONE,[ test "X${ac_COMMS}X" == "XnoneX" ])
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(lib/Makefile)
 AC_CONFIG_FILES(tests/Makefile)
+AC_CONFIG_FILES(benchmarks/Makefile)
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aaaff613..b129d3d9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = -L$(top_srcdir)/lib
 #
 # Test code
 #
-bin_PROGRAMS = Grid_main Grid_stencil Grid_nersc_io Grid_cshift Grid_gamma Grid_wilson Grid_simd
+bin_PROGRAMS = Grid_main Grid_stencil Grid_nersc_io Grid_cshift Grid_gamma  Grid_simd
 
 Grid_main_SOURCES = Grid_main.cc
 Grid_main_LDADD = -lGrid
@@ -22,8 +22,5 @@ Grid_gamma_LDADD = -lGrid
 Grid_stencil_SOURCES = Grid_stencil.cc
 Grid_stencil_LDADD = -lGrid
 
-Grid_wilson_SOURCES = Grid_wilson.cc
-Grid_wilson_LDADD = -lGrid
-
 Grid_simd_SOURCES = Grid_simd.cc
 Grid_simd_LDADD = -lGrid