From c8ef08267fd5e67f40defac1ae692e8ec906fa3f Mon Sep 17 00:00:00 2001
From: Cristian Cadar <c.cadar@imperial.ac.uk>
Date: Tue, 22 Dec 2020 19:52:12 +0000
Subject: Added -max-static-pct-check-delay to replace the hardcoded delay
 after which the MaxStatic*Pct checks are performed.

---
 lib/Core/Executor.cpp | 12 +++++++++++-
 lib/Core/Executor.h   |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib/Core')

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index cea7f173..cc3ac50f 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -365,6 +365,12 @@ cl::opt<double> MaxStaticCPSolvePct(
              "instructions (default=1.0 (always))"),
     cl::cat(TerminationCat));
 
+cl::opt<std::string> MaxStaticPctCheckDelay(
+    "max-static-pct-check-delay",
+    cl::desc("Time after which the --max-static-*-pct checks are enforced (default=60s)"),
+    cl::init("60s"),
+    cl::cat(TerminationCat));
+
 cl::opt<std::string> TimerInterval(
     "timer-interval",
     cl::desc("Minimum interval to check timers. "
@@ -485,6 +491,8 @@ Executor::Executor(LLVMContext &ctx, const InterpreterOptions &opts,
   this->solver = new TimingSolver(solver, EqualitySubstitution);
   memory = new MemoryManager(&arrayCache);
 
+  maxStaticPctCheckDelay = time::Span{MaxStaticPctCheckDelay};
+
   initializeSearchOptions();
 
   if (OnlyOutputStatesCoveringNew && !StatsTracker::useIStats())
@@ -971,7 +979,9 @@ ref<Expr> Executor::maxStaticPctChecks(ExecutionState &current,
       MaxStaticCPForkPct == 1. && MaxStaticCPSolvePct == 1.)
     return condition;
 
-  if (statsTracker->elapsed() <= time::seconds(60))
+  // these checks are performed only after MaxStaticPctCheckDelay time has
+  // passed since execution started
+  if (statsTracker->elapsed() <= maxStaticPctCheckDelay)
     return condition;
 
   StatisticManager &sm = *theStatisticManager;
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index ae960731..db8e508c 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -205,6 +205,9 @@ private:
   /// Maximum time to allow for a single instruction.
   time::Span maxInstructionTime;
 
+  /// Time after which the --max-static-*-pct checks are enforced
+  time::Span maxStaticPctCheckDelay;
+
   /// Assumes ownership of the created array objects
   ArrayCache arrayCache;
 
-- 
cgit 1.4.1