[WIP] Add memory measurements to interpreted PyROOT

include/rootbench/MemoryMeasurement.h

@@ -0,0 +1,13 @@
+///\file Memory measurement.
+
+#include <string>
+
+//running usr/bin/time to collect measurements in perffile
+std::string getMemoryStats(const std::string& dir, const std::string& filename, std::string& rootInvocation, const std::string& rootexe, const std::string& endInvoc);
+
+//getting Maximum resident set size form perffile and storing in peakSize
+int getMemoryMeasurement(std::string& perftutorial);
+
+//extracting filename from given path
+std::string getFileName(std::string& path);
+

lib/CMakeLists.txt

@@ -1,3 +1,4 @@
 RB_ADD_LIBRARY(RBSupport
   ErrorHandling.cxx
+  MemoryMeasurement.cxx
   )

lib/MemoryMeasurement.cxx

@@ -0,0 +1,51 @@
+///\file Contains utilities to measure memory usage.
+#include <iostream>
+#include <cstdlib>
+#include <string>
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
+#include <unistd.h>
+#include <chrono>
+#include <stdlib.h>
+#include "rootbench/RBConfig.h"
+#include "rootbench/MemoryMeasurement.h"
+
+std::string getFileName(std::string path) {
+	std::string base_fn = path.substr(path.find_last_of("/\\") + 1);
+	return base_fn.substr(0, base_fn.find_last_of('.'));
+}
+
+std::string getMemoryStats(const std::string& dir, const std::string& filename, std::string& rootInvocation, const std::string& rootexe, const std::string& endInvoc) {
+		std::string perffile="";
+		if (access("/usr/bin/time", X_OK) == 0) {
+			std::string rootsys = RB::GetRootSys();
+			std::string thisroot = rootsys + "/bin/thisroot.sh";
+			perffile = getFileName(filename) + "_perfile.txt";
+			if (!filename.empty()) {
+				std::string fullpath = rootsys + "/" + dir + filename;
+				// FIXME: no source in /usr/dash
+		    // We are writing /usr/bin/time -v output in file to get maximum resident memory for the benchmark
+				rootInvocation = "/usr/bin/time -v -o \"" + perffile + rootexe + fullpath + endInvoc;
+				std::cout<<"helllloooooooooooooooooooo     "<< rootInvocation <<"      hellllllloooooooooooooo"<<std::endl;
+			}
+			else {
+				rootInvocation = "/usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b "; // for pyroot?
+			}
+		}
+		else {
+			std::cout << "Cannot find usr/bin/time" << std::endl;
+	}
+	return perffile;
+}
+//  rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b -n -x \"" + fullpath + "\" -e return ";
+//  rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b ";
+
+int getMemoryMeasurement(std::string& perftutorial) {
+		int peakSize=0;
+	  std::string memorytutorial = "cat \"" + perftutorial + "\"| grep 'Maximum resident set size' | awk '{print $6}' > tmp_mem_file";
+    int res = std::system(memorytutorial.c_str());
+    (void) res;
+    std::ifstream("tmp_mem_file") >> peakSize;
+		return peakSize;
+}

root/interpreter/CMakeLists.txt

@@ -4,4 +4,4 @@ RB_ADD_GBENCHMARK(InterpreterBenchmarks
 
 RB_ADD_GBENCHMARK(InterpreterBenchmarksNoPCH
   RunInterpreterNoPCH.cxx
-  LABEL short)
+  LABEL short)

root/interpreter/InterpreterTest.h

@@ -11,39 +11,27 @@
 
 #include <chrono>
 
-#include "rootbench/RBConfig.h"
+//#include "rootbench/RBConfig.h"
+#include "rootbench/MemoryMeasurement.h"
 
-static int runTutorial(const std::string& dir, const std::string& filename, const std::string& perffile) {
-  std::string rootsys = RB::GetRootSys();
+static int runTutorial(const std::string& dir, const std::string& filename, std::string& perftutorial) {
   std::string rootInvocation;
-  std::string thisroot = rootsys + "/bin/thisroot.sh";
-  if (!filename.empty()) {
-    std::string fullpath = rootsys + "/" + dir + "/" + filename;
-    // FIXME: no source in /usr/dash
-    // We are writing /usr/bin/time -v output in file to get maximum resident memory for the benchmark
-    rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b -n -x \"" + fullpath + "\" -e return ";
-  } else {
-    rootInvocation = "source \"" + thisroot + "\" && /usr/bin/time -v -o \"" + perffile + "\" root.exe -l -q -b ";
-  }
-
+  std::string rootexe = "\" root.exe -l -q -b -n -x \"";
+  std::string endInvoc = "\" -e return ";
+  perftutorial = getMemoryStats(dir,filename,rootInvocation, rootexe, endInvoc);
     return std::system(rootInvocation.c_str());
 }
 
 static void TestTutorial(benchmark::State &state, const char *dir, const char *tutorial) {
   int peakSize = 0;
-  std::string perftutorial ("perfile.txt");
   for(auto _ : state){
       auto start = std::chrono::high_resolution_clock::now();
-      runTutorial(dir, tutorial,perftutorial);
-      auto end   = std::chrono::high_resolution_clock::now();
-      auto elapsed_seconds =
-      std::chrono::duration_cast<std::chrono::duration<double>>(
-        end - start);
+      std::string perftutorial="";
+      runTutorial(dir, tutorial, perftutorial);
+      auto end = std::chrono::high_resolution_clock::now();
+      auto elapsed_seconds = std::chrono::duration_cast<std::chrono::duration<double>>(end - start);
       state.SetIterationTime(elapsed_seconds.count());
-      std::string memorytutorial = "cat \"" + perftutorial + "\"| grep 'Maximum resident set size' | awk '{print $6}' > tmp_mem_file";
-      int res = std::system(memorytutorial.c_str());
-      (void) res;
-      std::ifstream("tmp_mem_file") >> peakSize;
+      peakSize = getMemoryMeasurement(perftutorial);
    }
    state.counters.insert({{"RSS", peakSize}});
 }

root/pyroot/PyROOTTest.h

@@ -11,25 +11,32 @@
 
 #include <chrono>
 
-#include "rootbench/RBConfig.h"
+//#include "rootbench/RBConfig.h"
+#include "rootbench/MemoryMeasurement.h"
 
-static int runTutorial(const std::string& dir, const std::string& filename) {
-  std::string rootsys = RB::GetRootSys();
-  std::string fullpath = rootsys + "/" + dir + "/" + filename;
-  std::string rootInvocation = "root -l -b -q -e 'TPython::Exec(\" exec( open(\"" + fullpath + "\").read())\")'";
+static int runTutorial(const std::string& dir, const std::string& filename, std::string& perftutorial) {
+  std::string rootInvocation;
+  std::string rootexe = "\" root -l -b -q -e 'TPython::Exec(\" exec( open('";
+  std::string endInvoc = "').read())\")'";
+  perftutorial = getMemoryStats(dir,filename,rootInvocation, rootexe, endInvoc);
     return std::system(rootInvocation.c_str());
+
+  // std::string rootsys = RB::GetRootSys();
+  // std::string fullpath = rootsys + "/" + dir + "/" + filename;
+  // std::string rootInvocation = "root -l -b -q -e 'TPython::Exec(\" exec( open(\"" + fullpath + "\").read())\")'";
+  //   return std::system(rootInvocation.c_str());
 }
 
 static void TestTutorial(benchmark::State &state, const char *dir, const char *tutorial) {
   int peakSize = 0;
   for(auto _ : state){
       auto start = std::chrono::high_resolution_clock::now();
-      runTutorial(dir, tutorial);
-      auto end   = std::chrono::high_resolution_clock::now();
-      auto elapsed_seconds =
-      std::chrono::duration_cast<std::chrono::duration<double>>(
-        end - start);
+      std::string perftutorial="";
+      runTutorial(dir, tutorial, perftutorial);
+      auto end = std::chrono::high_resolution_clock::now();
+      auto elapsed_seconds = std::chrono::duration_cast<std::chrono::duration<double>>(end - start);
       state.SetIterationTime(elapsed_seconds.count());
+      peakSize = getMemoryMeasurement(perftutorial);
    }
    state.counters.insert({{"RSS", peakSize}});
 }