Renaming solver-related command-line options in order to decouple them from STP. More specifically, command-line options max-stp-time, use-forked-stp and stp-optimize-divides renamed to max-solver-time, use-forked-solver and solver-optimize-divides, respectively.

Option of running the SMT solver in a separate process (i.e. forked) set to true by default.

Options of running SMT solver forked and with optimized divides made available to Kleaver as well.

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp
index 5b9e43a6..47c4f07f 100644
--- a/tools/kleaver/main.cpp
+++ b/tools/kleaver/main.cpp
@@ -214,9 +214,9 @@ static bool EvaluateInputAST(const char *Filename,
   Solver *S   = 0;
   Solver *STP = 0;
   if (!UseDummySolver) {
-    STPSolver* stpSolver = new STPSolver(true);
-    if (0 != MaxSTPTime) {
-      stpSolver->setTimeout(MaxSTPTime);    
+    STPSolver* stpSolver = new STPSolver(UseForkedCoreSolver);
+    if (0 != MaxCoreSolverTime) {
+      stpSolver->setTimeout(MaxCoreSolverTime);    
     }
     STP = S = stpSolver;
   }