not generate klee file by default; toString for TestPrg

Author: Kraks

benchmarks/demo-benchmarks/Makefile

@@ -14,7 +14,7 @@ KLEE_GEN := $(wildcard ./klee-*)
 
 LLSC_TARGET := $(SRC_FILES:%.c=%.ll)
 
-all: llsc klee
+all: llsc
 
 llsc: $(LLSC_TARGET)
 klee: $(KLEE_TARGET)

benchmarks/external-lib/Makefile

@@ -14,7 +14,7 @@ KLEE_GEN := $(wildcard ./klee-*)
 
 LLSC_TARGET := $(SRC_FILES:%.c=%.ll)
 
-all: llsc klee
+all: llsc
 
 llsc: $(LLSC_TARGET)
 klee: $(KLEE_TARGET)

benchmarks/llvm/Makefile

@@ -14,7 +14,7 @@ KLEE_GEN := $(wildcard ./klee-*)
 
 LLSC_TARGET := $(SRC_FILES:%.c=%.ll)
 
-all: llsc klee
+all: llsc
 
 llsc: $(LLSC_TARGET)
 klee: $(KLEE_TARGET)

benchmarks/oopsla20/Makefile

@@ -1,6 +1,6 @@
 KLEE_INCLUDE = ../../../../klee_experiment/klee-2.1/include
 
-all: generate_sse generate_klee
+all: generate_sse
 
 generate_sse:
 	clang-11 multipath_1024_sym.c -O0 -emit-llvm -S -fno-discard-value-names -o multipath_1024_sym.ll

benchmarks/opt-experiments/Makefile

@@ -14,7 +14,7 @@ KLEE_GEN := $(wildcard ./klee-*)
 
 LLSC_TARGET := $(SRC_FILES:%.c=%.ll)
 
-all: llsc klee
+all: llsc
 
 llsc: $(LLSC_TARGET)
 klee: $(KLEE_TARGET)

src/test/scala/sai/llsc/OptExperiment.scala

@@ -29,37 +29,40 @@ class Optimization extends TestLLSC {
   import scala.collection.mutable.ListBuffer
   import java.io.{File, FileWriter}
   val writer = new FileWriter(new File("opt_exp.csv"), true)
-  val N = 0
+  val N = 5
 
   def testLLSC(N: Int, llsc: LLSC, tst: TestPrg): Unit = {
     val TestPrg(m, name, f, config, cliArg, exp) = tst
     test(llsc.insName + "_" + name) {
       val code = llsc.run(m, llsc.insName + "_" + name, f, config)
-      val mkRet = code.make(4)
+      val mkRet = code.make(8)
       assert(mkRet == 0, "make failed")
       for (i <- 1 to N) {
         Thread.sleep(1 * 1000)
         val prefix = "numactl -N1 -m1"
         val (output, ret) = code.runWithStatus(cliArg, prefix)
         val resStat = parseOutput(llsc.insName, name, output)
         System.out.println(resStat)
-        writer.append(s"$resStat\n")
+        writer.append(s"${tst.toString}\n")
+        writer.append(s"$output\n")
+        writer.append(s"$resStat\n\n")
         writer.flush()
       }
     }
   }
 }
 
 /*
+// Test algorithm benchmarks
 class TestImpCPSOpt extends Optimization {
   val llsc = new ImpCPSLLSC
   Config.enableOpt
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/mergesort.ll"), "mergeSort_Opt", "@main", noArg, "--solver=z3", nPath(5040)))
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/bubblesort.ll"), "bubbleSort_Opt", "@main", noArg, "--solver=z3", nPath(720)))
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/knapsack.ll"), "knapsack_Opt", "@main", noArg, "--solver=z3", nPath(1666)))
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/kmpmatcher.ll"), "kmp_Opt", "@main", noArg, "--solver=z3", nPath(4181)))
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/nqueen.ll"), "nqueen_Opt", "@main", noArg, "--solver=z3", nPath(1363)))
-  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/quicksort.ll"), "quicksort_Opt", "@main", noArg, "--solver=z3", nPath(5040)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/kmpmatcher.ll"), "kmp_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(4181)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/mergesort.ll"), "mergeSort_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(5040)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/bubblesort.ll"), "bubbleSort_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(720)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/knapsack.ll"), "knapsack_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(1666)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/nqueen.ll"), "nqueen_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(1363)))
+  testLLSC(N, llsc, TestPrg(parseFile("benchmarks/opt-experiments/quicksort.ll"), "quicksort_Opt", "@main", noArg, "--cons-indep --solver=z3", nPath(5040)))
 }
 
 class TestPureCPSOpt extends Optimization {

src/test/scala/sai/llsc/TestCases.scala

@@ -23,7 +23,9 @@ import Config._
  * runOpt: the command line argument to run the compiled executable
  * exp: expected return status of the compiled executable, use the Map combinator in object TestPrg
  */
-case class TestPrg(m: Module, name: String, f: String, config: Config, runOpt: Seq[String], exp: Map[String, Any])
+case class TestPrg(m: Module, name: String, f: String, config: Config, runOpt: Seq[String], exp: Map[String, Any]) {
+  override def toString = s"${m.mname}, $name, $f, $config, $runOpt, $exp"
+}
 
 object TestPrg {
   val nPath = "nPath"     // expected number of explored paths