diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Basic/CmdLineOptions.cpp | 26 | ||||
| -rw-r--r-- | lib/Core/Executor.cpp | 78 | ||||
| -rw-r--r-- | lib/Solver/CoreSolver.cpp | 87 |
3 files changed, 116 insertions, 75 deletions
diff --git a/lib/Basic/CmdLineOptions.cpp b/lib/Basic/CmdLineOptions.cpp index eac54141..d7157b25 100644 --- a/lib/Basic/CmdLineOptions.cpp +++ b/lib/Basic/CmdLineOptions.cpp @@ -75,18 +75,26 @@ llvm::cl::list<QueryLoggingSolverType> queryLoggingOptions( #ifdef SUPPORT_METASMT -llvm::cl::opt<klee::MetaSMTBackendType> -UseMetaSMT("use-metasmt", - llvm::cl::desc("Use MetaSMT as an underlying SMT solver and specify the solver backend type."), - llvm::cl::values(clEnumValN(METASMT_BACKEND_NONE, "none", "Don't use metaSMT"), - clEnumValN(METASMT_BACKEND_STP, "stp", "Use metaSMT with STP"), - clEnumValN(METASMT_BACKEND_Z3, "z3", "Use metaSMT with Z3"), - clEnumValN(METASMT_BACKEND_BOOLECTOR, "btor", "Use metaSMT with Boolector"), - clEnumValEnd), - llvm::cl::init(METASMT_BACKEND_NONE)); +llvm::cl::opt<klee::MetaSMTBackendType> MetaSMTBackend( + "metasmt-backend", + llvm::cl::desc("Specify the MetaSMT solver backend type."), + llvm::cl::values( + clEnumValN(METASMT_BACKEND_STP, "stp", "Use metaSMT with STP"), + clEnumValN(METASMT_BACKEND_Z3, "z3", "Use metaSMT with Z3"), + clEnumValN(METASMT_BACKEND_BOOLECTOR, "btor", + "Use metaSMT with Boolector"), + clEnumValEnd), + llvm::cl::init(METASMT_BACKEND_STP)); #endif /* SUPPORT_METASMT */ +llvm::cl::opt<CoreSolverType> CoreSolverToUse( + "solver-backend", llvm::cl::desc("Specifiy the core solver backend to use"), + llvm::cl::values(clEnumValN(STP_SOLVER, "stp", "stp (default)"), + clEnumValN(METASMT_SOLVER, "metasmt", "metaSMT"), + clEnumValN(DUMMY_SOLVER, "dummy", "Dummy solver"), + clEnumValEnd), + llvm::cl::init(STP_SOLVER)); } diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 9211f485..854754b0 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -107,29 +107,6 @@ using namespace llvm; using namespace klee; -#ifdef SUPPORT_METASMT - -#include <metaSMT/frontend/Array.hpp> -#include <metaSMT/backend/Z3_Backend.hpp> -#include <metaSMT/backend/Boolector.hpp> -#include <metaSMT/backend/MiniSAT.hpp> -#include <metaSMT/DirectSolver_Context.hpp> -#include <metaSMT/support/run_algorithm.hpp> -#include <metaSMT/API/Stack.hpp> -#include <metaSMT/API/Group.hpp> - -#define Expr VCExpr -#define Type VCType -#define STP STP_Backend -#include <metaSMT/backend/STP.hpp> -#undef Expr -#undef Type -#undef STP - -using namespace metaSMT; -using namespace metaSMT::solver; - -#endif /* SUPPORT_METASMT */ @@ -293,50 +270,19 @@ Executor::Executor(const InterpreterOptions &opts, : std::max(MaxCoreSolverTime,MaxInstructionTime)) { if (coreSolverTimeout) UseForkedCoreSolver = true; - - Solver *coreSolver = NULL; - -#ifdef SUPPORT_METASMT - if (UseMetaSMT != METASMT_BACKEND_NONE) { - - std::string backend; - - switch (UseMetaSMT) { - case METASMT_BACKEND_STP: - backend = "STP"; - coreSolver = new MetaSMTSolver< DirectSolver_Context < STP_Backend > >(UseForkedCoreSolver, CoreSolverOptimizeDivides); - break; - case METASMT_BACKEND_Z3: - backend = "Z3"; - coreSolver = new MetaSMTSolver< DirectSolver_Context < Z3_Backend > >(UseForkedCoreSolver, CoreSolverOptimizeDivides); - break; - case METASMT_BACKEND_BOOLECTOR: - backend = "Boolector"; - coreSolver = new MetaSMTSolver< DirectSolver_Context < Boolector > >(UseForkedCoreSolver, CoreSolverOptimizeDivides); - break; - default: - assert(false); - break; - }; - llvm::errs() << "Starting MetaSMTSolver(" << backend << ") ...\n"; - } - else { - coreSolver = new STPSolver(UseForkedCoreSolver, CoreSolverOptimizeDivides); - } -#else - coreSolver = new STPSolver(UseForkedCoreSolver, CoreSolverOptimizeDivides); -#endif /* SUPPORT_METASMT */ - - - Solver *solver = - constructSolverChain(coreSolver, - interpreterHandler->getOutputFilename(ALL_QUERIES_SMT2_FILE_NAME), - interpreterHandler->getOutputFilename(SOLVER_QUERIES_SMT2_FILE_NAME), - interpreterHandler->getOutputFilename(ALL_QUERIES_PC_FILE_NAME), - interpreterHandler->getOutputFilename(SOLVER_QUERIES_PC_FILE_NAME)); - - this->solver = new TimingSolver(solver, EqualitySubstitution); + Solver *coreSolver = klee::createCoreSolver(CoreSolverToUse); + if (!coreSolver) { + llvm::errs() << "Failed to create core solver\n"; + exit(1); + } + Solver *solver = constructSolverChain( + coreSolver, + interpreterHandler->getOutputFilename(ALL_QUERIES_SMT2_FILE_NAME), + interpreterHandler->getOutputFilename(SOLVER_QUERIES_SMT2_FILE_NAME), + interpreterHandler->getOutputFilename(ALL_QUERIES_PC_FILE_NAME), + interpreterHandler->getOutputFilename(SOLVER_QUERIES_PC_FILE_NAME)); + this->solver = new TimingSolver(solver, EqualitySubstitution); memory = new MemoryManager(&arrayCache); } diff --git a/lib/Solver/CoreSolver.cpp b/lib/Solver/CoreSolver.cpp new file mode 100644 index 00000000..9d21931d --- /dev/null +++ b/lib/Solver/CoreSolver.cpp @@ -0,0 +1,87 @@ +//===-- CoreSolver.cpp ------------------------------------------*- C++ -*-===// +// +// The KLEE Symbolic Virtual Machine +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "klee/CommandLine.h" +#include "klee/Solver.h" +#include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/raw_ostream.h" +#include <string> + +#ifdef SUPPORT_METASMT + +#include <metaSMT/frontend/Array.hpp> +#include <metaSMT/backend/Z3_Backend.hpp> +#include <metaSMT/backend/Boolector.hpp> +#include <metaSMT/backend/MiniSAT.hpp> +#include <metaSMT/DirectSolver_Context.hpp> +#include <metaSMT/support/run_algorithm.hpp> +#include <metaSMT/API/Stack.hpp> +#include <metaSMT/API/Group.hpp> + +#define Expr VCExpr +#define Type VCType +#define STP STP_Backend +#include <metaSMT/backend/STP.hpp> +#undef Expr +#undef Type +#undef STP + +using namespace metaSMT; +using namespace metaSMT::solver; + +static Solver *handleMetaSMT() { + Solver *coreSolver = NULL; + std::string backend; + switch (MetaSMTBackend) { + case METASMT_BACKEND_STP: + backend = "STP"; + coreSolver = new MetaSMTSolver<DirectSolver_Context<STP_Backend> >( + UseForkedCoreSolver, CoreSolverOptimizeDivides); + break; + case METASMT_BACKEND_Z3: + backend = "Z3"; + coreSolver = new MetaSMTSolver<DirectSolver_Context<Z3_Backend> >( + UseForkedCoreSolver, CoreSolverOptimizeDivides); + break; + case METASMT_BACKEND_BOOLECTOR: + backend = "Boolector"; + coreSolver = new MetaSMTSolver<DirectSolver_Context<Boolector> >( + UseForkedCoreSolver, CoreSolverOptimizeDivides); + break; + default: + llvm_unreachable("Unrecognised metasmt backend"); + break; + }; + llvm::errs() << "Starting MetaSMTSolver(" << backend << ") ...\n"; + return coreSolver; +} +#endif /* SUPPORT_METASMT */ + +namespace klee { + +Solver *createCoreSolver(CoreSolverType cst) { + switch (cst) { + case STP_SOLVER: + llvm::errs() << "Using STP solver backend\n"; + return new STPSolver(UseForkedCoreSolver, CoreSolverOptimizeDivides); + case METASMT_SOLVER: +#ifdef SUPPORT_METASMT + llvm::errs() << "Using MetaSMT solver backend\n"; + return handleMetaSMT(); +#else + llvm::errs() << "Not compiled with MetaSMT support\n"; + return NULL; +#endif + case DUMMY_SOLVER: + return createDummySolver(); + default: + llvm_unreachable("Unsupported CoreSolverType"); + } +} +} |