From 1ba25a0d8c728f18dad32649c5be0572f79e27af Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Wed, 7 Oct 2020 15:38:41 +0100
Subject: [PATCH] more I/O benchmark code cleaning

---
 benchmarks/Benchmark_IO_vs_dir.cc | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/benchmarks/Benchmark_IO_vs_dir.cc b/benchmarks/Benchmark_IO_vs_dir.cc
index 9c254e27..9ccfd554 100644
--- a/benchmarks/Benchmark_IO_vs_dir.cc
+++ b/benchmarks/Benchmark_IO_vs_dir.cc
@@ -8,7 +8,6 @@ using namespace Grid;
 
 int main (int argc, char ** argv)
 {
-#ifdef HAVE_LIME
   std::vector<std::string> dir;
   unsigned int             Ls;
   bool                     rb;
@@ -40,6 +39,26 @@ int main (int argc, char ** argv)
   MSG << "Grid is setup to use " << threads << " threads" << std::endl;
   MSG << "MPI partition " << mpi << std::endl;
 
+  MSG << SEP << std::endl;
+  MSG << "Benchmark Grid std write" << std::endl;
+  MSG << SEP << std::endl;
+  for (auto &d: dir)
+  {
+    MSG << "-- Directory " << d << std::endl;
+    writeBenchmark<LatticeFermion>(GridDefaultLatt(), d + "/ioBench", 
+                                   stdWrite<LatticeFermion>, Ls, rb);
+  }
+  MSG << SEP << std::endl;
+  MSG << "Benchmark Grid std read" << std::endl;
+  MSG << SEP << std::endl;
+  for (auto &d: dir)
+  {
+    MSG << "-- Directory " << d << std::endl;
+    readBenchmark<LatticeFermion>(GridDefaultLatt(), d + "/ioBench", 
+                                  stdRead<LatticeFermion>, Ls, rb);
+  }
+
+#ifdef HAVE_LIME
   MSG << SEP << std::endl;
   MSG << "Benchmark Grid C-Lime write" << std::endl;
   MSG << SEP << std::endl;
@@ -58,6 +77,7 @@ int main (int argc, char ** argv)
     readBenchmark<LatticeFermion>(GridDefaultLatt(), d + "/ioBench", 
                                   limeRead<LatticeFermion>, Ls, rb);
   }
+#endif
 
   // MSG << SEP << std::endl;
   // MSG << "Benchmark single precision Lime write" << std::endl;
@@ -78,7 +98,6 @@ int main (int argc, char ** argv)
   // }
 
   Grid_finalize();
-  
-#endif
+
   return EXIT_SUCCESS;
 }