diff options
author | yoni206 <yoni206@users.noreply.github.com> | 2018-05-15 18:17:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-15 18:17:01 -0700 |
commit | e2b8d90e1ea596a960de9ddb75094e7f6d7856e8 (patch) | |
tree | e8e03b5236cd1c2e3acc9b923019a1fd61cef948 /src/smt | |
parent | 016c3e69a7bf5f89ca4625b41db8571a6849fb68 (diff) |
Refactor static learning preprocessing pass (#1857)
Diffstat (limited to 'src/smt')
-rw-r--r-- | src/smt/smt_engine.cpp | 46 |
1 files changed, 9 insertions, 37 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 7f34bb39e..82147c094 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -77,6 +77,7 @@ #include "preprocessing/passes/int_to_bv.h" #include "preprocessing/passes/pseudo_boolean_processor.h" #include "preprocessing/passes/real_to_int.h" +#include "preprocessing/passes/static_learning.h" #include "preprocessing/passes/symmetry_breaker.h" #include "preprocessing/passes/symmetry_detect.h" #include "preprocessing/preprocessing_pass.h" @@ -190,8 +191,6 @@ struct SmtEngineStatistics { IntStat d_numMiplibAssertionsRemoved; /** number of constant propagations found during nonclausal simp */ IntStat d_numConstantProps; - /** time spent in static learning */ - TimerStat d_staticLearningTime; /** time spent in simplifying ITEs */ TimerStat d_simpITETime; /** time spent in simplifying ITEs */ @@ -233,7 +232,6 @@ struct SmtEngineStatistics { d_miplibPassTime("smt::SmtEngine::miplibPassTime"), d_numMiplibAssertionsRemoved("smt::SmtEngine::numMiplibAssertionsRemoved", 0), d_numConstantProps("smt::SmtEngine::numConstantProps", 0), - d_staticLearningTime("smt::SmtEngine::staticLearningTime"), d_simpITETime("smt::SmtEngine::simpITETime"), d_unconstrainedSimpTime("smt::SmtEngine::unconstrainedSimpTime"), d_iteRemovalTime("smt::SmtEngine::iteRemovalTime"), @@ -258,7 +256,6 @@ struct SmtEngineStatistics { smtStatisticsRegistry()->registerStat(&d_miplibPassTime); smtStatisticsRegistry()->registerStat(&d_numMiplibAssertionsRemoved); smtStatisticsRegistry()->registerStat(&d_numConstantProps); - smtStatisticsRegistry()->registerStat(&d_staticLearningTime); smtStatisticsRegistry()->registerStat(&d_simpITETime); smtStatisticsRegistry()->registerStat(&d_unconstrainedSimpTime); smtStatisticsRegistry()->registerStat(&d_iteRemovalTime); @@ -284,7 +281,6 @@ struct SmtEngineStatistics { smtStatisticsRegistry()->unregisterStat(&d_miplibPassTime); smtStatisticsRegistry()->unregisterStat(&d_numMiplibAssertionsRemoved); smtStatisticsRegistry()->unregisterStat(&d_numConstantProps); - smtStatisticsRegistry()->unregisterStat(&d_staticLearningTime); smtStatisticsRegistry()->unregisterStat(&d_simpITETime); smtStatisticsRegistry()->unregisterStat(&d_unconstrainedSimpTime); smtStatisticsRegistry()->unregisterStat(&d_iteRemovalTime); @@ -2618,10 +2614,10 @@ void SmtEnginePrivate::finishInit() { // actually assembling preprocessing pipelines). std::unique_ptr<BoolToBV> boolToBv( new BoolToBV(d_preprocessingPassContext.get())); - std::unique_ptr<BVAckermann> bvAckermann( - new BVAckermann(d_preprocessingPassContext.get())); std::unique_ptr<BvAbstraction> bvAbstract( new BvAbstraction(d_preprocessingPassContext.get())); + std::unique_ptr<BVAckermann> bvAckermann( + new BVAckermann(d_preprocessingPassContext.get())); std::unique_ptr<BVGauss> bvGauss( new BVGauss(d_preprocessingPassContext.get())); std::unique_ptr<BvIntroPow2> bvIntroPow2( @@ -2634,6 +2630,8 @@ void SmtEnginePrivate::finishInit() { new PseudoBooleanProcessor(d_preprocessingPassContext.get())); std::unique_ptr<RealToInt> realToInt( new RealToInt(d_preprocessingPassContext.get())); + std::unique_ptr<StaticLearning> staticLearning( + new StaticLearning(d_preprocessingPassContext.get())); std::unique_ptr<SymBreakerPass> sbProc( new SymBreakerPass(d_preprocessingPassContext.get())); d_preprocessingPassRegistry.registerPass("bool-to-bv", std::move(boolToBv)); @@ -2649,6 +2647,8 @@ void SmtEnginePrivate::finishInit() { d_preprocessingPassRegistry.registerPass("pseudo-boolean-processor", std::move(pbProc)); d_preprocessingPassRegistry.registerPass("real-to-int", std::move(realToInt)); + d_preprocessingPassRegistry.registerPass("static-learning", + std::move(staticLearning)); d_preprocessingPassRegistry.registerPass("sym-break", std::move(sbProc)); } @@ -2884,26 +2884,7 @@ void SmtEnginePrivate::removeITEs() { } } -void SmtEnginePrivate::staticLearning() { - d_smt.finalOptionsAreSet(); - spendResource(options::preprocessStep()); - - TimerStat::CodeTimer staticLearningTimer(d_smt.d_stats->d_staticLearningTime); - Trace("simplify") << "SmtEnginePrivate::staticLearning()" << endl; - - for (unsigned i = 0; i < d_assertions.size(); ++ i) { - - NodeBuilder<> learned(kind::AND); - learned << d_assertions[i]; - d_smt.d_theoryEngine->ppStaticLearn(d_assertions[i], learned); - if(learned.getNumChildren() == 1) { - learned.clear(); - } else { - d_assertions.replace(i, learned); - } - } -} // do dumping (before/after any preprocessing pass) static void dumpAssertions(const char* key, @@ -4264,21 +4245,12 @@ void SmtEnginePrivate::processAssertions() { d_preprocessingPassRegistry.getPass("sym-break")->apply(&d_assertions); } - dumpAssertions("pre-static-learning", d_assertions); if(options::doStaticLearning()) { - Trace("smt-proc") << "SmtEnginePrivate::processAssertions() : pre-static-learning" << endl; - // Perform static learning - Chat() << "doing static learning..." << endl; - Trace("simplify") << "SmtEnginePrivate::simplify(): " - << "performing static learning" << endl; - staticLearning(); - Trace("smt-proc") << "SmtEnginePrivate::processAssertions() : post-static-learning" << endl; + d_preprocessingPassRegistry.getPass("static-learning") + ->apply(&d_assertions); } - dumpAssertions("post-static-learning", d_assertions); - Debug("smt") << " d_assertions : " << d_assertions.size() << endl; - Trace("smt-proc") << "SmtEnginePrivate::processAssertions() : pre-ite-removal" << endl; dumpAssertions("pre-ite-removal", d_assertions); { |