Merge pull request #1 from s5z/master

Sync with s5z/zsim
arodchen · Jul 12, 2015 · b77fa71 · b77fa71
2 parents 0b9eded + 5b6505c
commit b77fa71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/SConstruct b/SConstruct
@@ -17,10 +17,10 @@ def buildSim(cppFlags, dir, type, pgo=None):
     versionFile = joinpath(buildDir, "version.h")
     if os.path.exists(".git"):
         env.Command(versionFile, allSrcs + [".git/index", "SConstruct"],
-            'echo "#define ZSIM_BUILDDATE \\""`date`\\""\\\\n#define ZSIM_BUILDVERSION \\""`python misc/gitver.py`\\""" >>' + versionFile)
+            'echo -e "#define ZSIM_BUILDDATE \\""`date`\\""\\\\n#define ZSIM_BUILDVERSION \\""`python misc/gitver.py`\\""" >>' + versionFile)
     else:
         env.Command(versionFile, allSrcs + ["SConstruct"],
-            'echo "#define ZSIM_BUILDDATE \\""`date`\\""\\\\n#define ZSIM_BUILDVERSION \\""no git repo\\""" >>' + versionFile)
+            'echo -e "#define ZSIM_BUILDDATE \\""`date`\\""\\\\n#define ZSIM_BUILDVERSION \\""no git repo\\""" >>' + versionFile)
 
     # Parallel builds?
     #env.SetOption('num_jobs', 32)

diff --git a/tests/het.cfg b/tests/het.cfg
@@ -84,7 +84,7 @@ sys = {
                 hash = "H3";
                 ways = 16;
             };
-            children = "l2_beefy l1i_wimpy|l1d_wimpy"
+            children = "l2_beefy l1i_wimpy|l1d_wimpy";
         };
     };
 

diff --git a/tests/simple.cfg b/tests/simple.cfg
@@ -30,7 +30,7 @@ sim = {
     phaseLength = 10000;
     // attachDebugger = True;
     schedQuantum = 50;  // switch threads frequently
-    procStatsFilter = "l1.*|l2.*"
+    procStatsFilter = "l1.*|l2.*";
 };
 
 process0 = {