summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-28Merge branch 'master' into docsLinkdocsLinkAndres Noetzli
2021-07-28Make extended rewriter methods const (#6948)Andrew Reynolds
2021-07-27bv: Refactor getEqualityStatus and use for both bitblasting solvers. (#6933)Mathias Preiner
This commit refactors the getEqualityStatus handling for bitblast and bitblast-internal.
2021-07-27proof: Add eqrange expansion rule. (#6936)Mathias Preiner
Adds proof support for the eqrange operator. Co-authored-by: Andrew Reynolds <andrew.j.reynolds@gmail.com>
2021-07-27Track instantiation reasons in proofs (#6935)Andrew Reynolds
This adds optional arguments to INSTANTIATE steps in proofs to track fine-grained reasons for relevant instantiations. Also simplifies an old argument modEq which was unused. FYI @MikolasJanota
2021-07-27Add basic LFSC utilities (#6879)Andrew Reynolds
Adds basic utilities in preparation for the LFSC proof conversion. Depends on #6881, review that first.
2021-07-27Move enum value generator to own file (#6941)Andrew Reynolds
Work towards integrating the enumerator callback into the fast enumerator.
2021-07-27Minor fix for term database + central equality engine (#6928)Andrew Reynolds
Previously we provided a bogus (self) explanation in a rare case of setting up the term database for higher order. This is incompatible with cases where central equality engine = master equality engine.
2021-07-27Revert change to regression (#6940)Andrew Reynolds
Although it works on most machines, it times out in the nightly builds.
2021-07-27Make all dependencies in the fast enumerator optional (#6918)Andrew Reynolds
This allows one to use a fast enumerator without having access to sygus term database, statistics, etc.
2021-07-27Add print expression utility (#6880)Andrew Reynolds
This will be used in the LFSC printer. It may be of general use to other proof printers.
2021-07-27Add regression for fixed `str.indexof_re` issue (#6938)Andres Noetzli
Fixes #6639. The issue cannot be reproduced on current master and git bisect suggests that commit adf497a fixed the issue.
2021-07-27Minor changes from proof-new (#6937)Andrew Reynolds
Note the change to the unit test makes it so the test is not dependent on Node ID order.
2021-07-26Miscellaneous fixes from proof-new (#6914)Andrew Reynolds
2021-07-27Add proof letify utility (#6881)Andrew Reynolds
Towards support for external proof conversions.
2021-07-27Fix eq proof conversion for constant merged parameterized ops (#6926)Andrew Reynolds
This issue arises when using the central equality engine on several regressions.
2021-07-27Default equality proofs for bags and separation logic (#6932)Andrew Reynolds
This is the last 2 remaining theories not to use the default handling of equality proofs. In preparation for proofs in central equality engine.
2021-07-27Add sygus enumerator callback (#6923)Andrew Reynolds
This class will make the uses of the fast enumerator customizable.
2021-07-26Move public options functions to separate file (#6671)Gereon Kremer
This PR moves the remaining special purpose functions out of the Options class. This set of functions is only used to implement API functions in the smt engine (getting and setting options by string), and by the main driver for parsing and printing usage information.
2021-07-26Enable default equality proofs for sets (#6931)Andrew Reynolds
This enables default support for equality proofs in the theory of sets. This is in preparation for proofs in the central equality engine, which requires that all active theories that use the central equality engine at least support the default interaction with the equality engine.
2021-07-26More updates to arithmetic in preparation for central equality engine (#6927)Andrew Reynolds
Makes arithEqSolver more robust to propagations from multiple sources, changes the default relationship to congruence manager based on preliminary results on SMT-LIB.
2021-07-25Changes to datatypes in preparation for central equality engine (#6901)Andrew Reynolds
This adds changes from the centralEeDev branch for datatypes. The changes in behavior are that the inference manager clears its pending inferences when the state is in conflict, and preCheck processes pending facts immediately (which may have been enqueued prior to the call to check via ee merges). These are required to make datatypes robust to the order in which check / merge / backtracks can occur.
2021-07-25Refactor equality engine setup for arithmetic congruence manager (#6902)Andrew Reynolds
Allows congruence manager to use its own (non-official) equality engine if both it and the arithmetic equality solver are enabled.
2021-07-24Fix CLN build (#6920)Andres Noetzli
Currently, the CLN `CONFIGURE_COMMAND` chains multiple commands using `&&` but this does not seem to work with CMake 3.20.4 and CMake 3.19.7 and is also not the recommended way of doing it. The commit fixes the issue by using additional `COMMAND`s and also switches to using the CMake's `chdir` instead of `cd`.
2021-07-23Configuration: Indicate dependencies being built (#6921)Andres Noetzli
This commit changes the output of our configuration to show which dependencies are being built as part of the cvc5 build. For example: ``` ABC : off CryptoMiniSat : off GLPK : off Kissat : off LibPoly : on (local) CoCoALib : off Build libcvc5 only : off MP library : gmp (system) Editline : off ``` Indicates that `LibPoly` was not found in the system and is thus built as part of the cvc5 build and GMP was found in the system.
2021-07-23Fix CoCoA build for newer compilers (#6919)Andres Noetzli
Newer compilers, such as GCC 11, default to C++17. CoCoA does not compile with C++17 and its check for the C++ version used by the compiler does not take into account newer C++ versions. As a result, building CoCoA using `--auto-download` fails with GCC 11. This commit adds a patch that makes the test in CoCoA take into account compilers that default to C++17 or newer.
2021-07-23FP: Add option to word-blast more lazily. (#6904)Aina Niemetz
When enabled, this does not word-blast when registering term but at preNotifyFact (= more lazily) instead. This is enabled via option --fp-lazy-wb.
2021-07-22Simplify computation of relevant terms in datatypes (#6885)Andrew Reynolds
This makes it so that we do not consider non-singleton equivalence classes of DT for non-datatype terms to be relevant. This impacts how model construction is done for datatypes. It's not clear why this method considered such terms to be relevant, I believe this was done to mask a previous bug; regressions now pass when this method is simplified. Doing this is definitely wrong when using central equality engine, hence the motivation for this simplification.
2021-07-22Add the central equality engine manager (#6893)Andrew Reynolds
This class is responsible for setting up the central equality engine. It relies on a new static method Theory::usesCentralEqualityEngine, which will be refined in followup PRs. This PR does not change the behavior, it only adds the class. Further PRs will connect this class to CombinationEngine, make it optionally enabled, and make the remaining changes to TheoryEngine to make it compatible.
2021-07-22Miscellaneous changes in preparation for central equality engine (#6900)Andrew Reynolds
2021-07-22Add support for minimal unsat cores (#4605)Andres Noetzli
This commit adds support for computing minimal unsat cores. The algorithm implemented in this commit is just a trivial deletion-based algorithm that tries to remove each assertion in the unsat core individually.
2021-07-22Preparation for carry the rewrite rule database in the proof checker (#6915)Andrew Reynolds
2021-07-22Add std::vector<Term> Op:: getIndices() and operator[] for Op (#6397)mudathirmahgoub
2021-07-21Print link to docs previewAndres Noetzli
This commit adds a message to the `docs` target with a link to a preview of the documentation, e.g.: ``` Preview docs in browser: file://localhost/home/noetzli/repos/cvc5_win/build-docs/docs/sphinx/index.html ```
2021-07-20[AUTHORS] Add CVC4 as part of CVC series (#6907)Haniel Barbosa
2021-07-20ANTLR3: Install into `CMAKE_INSTALL_LIBDIR` (#6912)Andres Noetzli
On some platforms, autotools installs ANTLR3's libraries into lib but CMAKE_INSTALL_LIBDIR is set to lib64 (e.g., Fedora 33). This commit sets --libdir to force autotools to install the library into the directory specified by CMAKE_INSTALL_LIBDIR.
2021-07-19'CryptoMiniSat_LIBRARIES' should respect lib/lib64 (#6905)Andrew V. Jones
On 64-bit openSUSE (and maybe other distributions), the default install directory for static libraries is `lib64` *not* `lib`. This has an impact on cvc5 when it is automatically building CMS (e.g., with `./configure.sh --cryptominisat --auto-download`): CMS adheres to the default value of `CMAKE_INSTALL_LIBDIR` to work out where to install the library files (so `lib64` on openSUSE), which fails when cvc5 tries to find these in `lib`. Without this change, the build fails as follows: ``` <snip> src/CMakeFiles/cvc5.dir/theory/type_enumerator.cpp.o -Wl,-rpath,:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: deps/lib/libcadical.a deps/lib/libcryptominisat5.a ../deps/install/lib64/libglpk.a deps/lib/libpicpolyxx.a /usr/lib64/libgmp.so deps/lib/libpicpoly.a /usr/lib64/libgmp.so && : /usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: cannot find deps/lib/libcryptominisat5.a: No such file or directory collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. ``` and where: ``` avj@platypus ~/clones/cvc5/master/build$ find . -iname "libcryptominisat5.a" ./deps/src/CryptoMiniSat-EP-build/lib/libcryptominisat5.a ./deps/lib64/libcryptominisat5.a ``` (notice: `lib64` in the second path!) This commit fixes this discrepancy to ensure that cvc5 checks for CMS on `CMAKE_INSTALL_LIBDIR` as well. **Note**: `CMAKE_INSTALL_LIBDIR` comes from `GNUInstallDirs`, and this is `include`'d in cvc5's top-level `CMakeLists.txt` Signed-off-by: Andrew V. Jones <andrewvaughanj@gmail.com>
2021-07-18'ANTLR3_RUNTIME' should respect lib/lib64 (#6906)Andrew V. Jones
On 64-bit openSUSE (and maybe other distributions), the default install directory for static libraries is `lib64` *not* `lib`. This has an impact on cvc5 when it is automatically building ANTLR3: ANTLR3 follows the system-wide default of `lib64`, which fails when cvc5 tries to find these in `lib`. Without this change, the build fails as follows: ``` <snip> src/parser/CMakeFiles/cvc5parser.dir/smt2/Smt2Parser.c.o -Wl,-rpath,/home/avj/clones/cvc5/lib64_cms/build/src:::::::::::::::::::::::: src/libcvc5.so.1 deps/lib/libantlr3c.a && : /usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: cannot find deps/lib/libantlr3c.a: No such file or directory collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. ``` and where: ``` avj@platypus ~/clones/cvc5/lib64_cms/build$ find . -iname "libantlr3c.a" ./deps/src/ANTLR3-EP-runtime/.libs/libantlr3c.a ./deps/lib64/libantlr3c.a ``` (notice: `lib64` in the second path!) This commit fixes this discrepancy to ensure that cvc5 checks for ANTLR3 on `CMAKE_INSTALL_LIBDIR`, which matches that `autotools` will use. **Note**: `CMAKE_INSTALL_LIBDIR` comes from `GNUInstallDirs`, and this is `include`'d in cvc5's top-level `CMakeLists.txt` Signed-off-by: Andrew V. Jones <andrewvaughanj@gmail.com>
2021-07-18Add n-ary term utilities (#6896)Andrew Reynolds
Initial work towards rewrite rule reconstruction
2021-07-16Do not exhaustive instantiation when FMF is disabled (#6899)Andrew Reynolds
This makes FMF not handle quantified formulas when FMF options are disabled, apart from those marked internal. This is required for combinations of sequences + quantified formulas.
2021-07-16[Unit Tests] Avoid linking against external libs (#6898)Andres Noetzli
Fixes #6866. The `theory_airth_cad_white` unit test has been failing on some platforms (e.g., macOS) due to statically linking libpoly in libcvc5 and then separately linking it in the unit tests. This resulted in issues with `static` variables. This commit fixes the issue by avoiding linking libpoly in the unit tests and instead relying solely on libcvc5. Co-authored-by: Ouyancheng <1024842937@qq.com>
2021-07-16[Unit Tests] Reenable `top_scope_context_obj` (#6892)Andres Noetzli
Fixes #6047. The test was disabled because ASan found a use-after-free due to an object allocated in the top scope being destroyed after the scope (see #2607 for a detailed explanation). At first, the plan was to add support for this use case. However, we have decided that we currently don't need support for this feature and added a guard against it (#6082). This commit reenables the test but changes it to destroy the object allocated in the top level scope before the corresponding level is popped. It additionally adds a test of the guard from #6082.
2021-07-15Fix context for proofs of instantiations (#6890)Andrew Reynolds
Caught by a regression on proof-new, where an instantiation was the symmetric equality of an instantiation on a previous call to check-sat. Proofs of instantiation should be user-context dependent.
2021-07-15Distinguish quantifiers preprocess as its own proof rule (#6897)Andrew Reynolds
2021-07-15Connect the equality solver to theory arith (#6894)Andrew Reynolds
--arith-eq-solver is a new option to enable the equality solver in arithmetic, disabled by default. This PR connects the equality solver to TheoryArith when this option is enabled. This is in preparation for the central equality engine.
2021-07-15Arithmetic equality solver (#6876)Andrew Reynolds
This is work towards the central equality engine. This adds a module of arithmetic that uses the equality engine in the default way. This class will be incorporated into theory_arith.cpp. It will be the replacement for CongruenceManager when we use the central equality engine architecture.
2021-07-15Move master equality engine notification to own file (#6877)Andrew Reynolds
Preparation for central equality engine.
2021-07-15Add node converter utility (#6878)Andrew Reynolds
Adds a utility for converting nodes. This is the first step towards the LFSC proof conversion.
2021-07-15bv: Disable bv-assert-input if proofs are enabled. (#6886)Mathias Preiner
2021-07-15bv: Rename BBSimple to NodeBitblaster. (#6891)Mathias Preiner
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback