Tim King [Tue, 15 Dec 2015 22:35:34 +0000 (14:35 -0800)]
Breaking the include cycle between Record and Expr.
Tim King [Fri, 4 Dec 2015 23:58:19 +0000 (15:58 -0800)]
Adding destructors for CDO an CDOhash_map in the restore() functions.
Tim King [Tue, 15 Dec 2015 21:36:08 +0000 (13:36 -0800)]
Removing the build cycle for predicate.
Tim King [Tue, 15 Dec 2015 21:29:49 +0000 (13:29 -0800)]
Moving SExpr(bool) out of the header into sexpr.cpp to be less verbose about the warning.
Tim King [Tue, 15 Dec 2015 18:33:55 +0000 (13:33 -0500)]
Making logic_info_forward.h a public header for now.
ajreynol [Tue, 15 Dec 2015 11:37:23 +0000 (12:37 +0100)]
Add option uf-ss-fair-monotone. Minor cleanup and improvement of sort inference.
Tim King [Tue, 15 Dec 2015 02:51:40 +0000 (18:51 -0800)]
Refactoring Options Handler & Library Cycle Breaking
What to Know As a User:
A number of files have moved. Users that include files in the public API in more refined ways than using #include <cvc4.h> should consult which files have moved. Note though that some files may move again after being cleaned up. A number of small tweaks have been made to the swig interfaces that may cause issues. Please file bug reports for any problems.
The Problem:
The build order of CVC4 used to be [roughly] specified as:
options < expr < util < libcvc4 < parsers < main
Each of these had their own directories and their own Makefile.am files. With the exception of the util/ directory, each of the subdirectories built exactly one convenience library. The util/ directory additionally built a statistics library. While the order above was partially correct, the build order was more complicated as options/Makefile.am executed building the sources for expr/Makefile.am as part of its BUILT_SOURCES phase. This options/Makefile.am also build the options/h and options.cpp files in other directories. There were cyclical library dependencies between the first four above libraries. All of these aspects combined to make options extremely brittle and hard to develop. Maintaining these between clang versus gcc, and bazel versus autotools has become increasing unpredictable.
The Solution:
To address these cyclic build problems, I am simplifying the build process. Here are the main things that have to happen:
1. util/ will be split into 3 separate directories: base, util, and smt_util. Each will have their own library and Makefile.am file.
2. Dependencies for options/ will be moved into options/. If a type appears as an option, this file will be moved into options.
3. All of the old options_handlers.h files have been refactored.
4. Some files have moved from util into expr/ to resolve cycles. Some of these moves are temporary.
5. I am removing the libstatistics library.
The constraints that the CVC4 build system will eventually satisfy are:
- The include order for both the .h and .cpp files for a directory must respect the order libraries are built. For example, a file in options/ cannot include from the expr/ directory. This includes built source files such as those coming from */kinds files and */options files.
- The types definitions must also respect the build order. Forward type declarations will be allowed in exceptional, justified cases.
- The Makefile.am for a directory cannot generate a file outside of the directory it controls. (Or call another Makefile.am except through subdirectory calls.)
- One library per Makefile.am.
- No extra copies of libraries will be built for the purpose of distinguishing between external and internal visibility in libraries for building parser/ or main/ libraries and binaries. Any function used by parser/ and main/ will be labeled with CVC4_PUBLIC and be in a public API. (AFAICT, libstatistics was being built exactly to skirt this.)
The build order of CVC4 can now be [roughly] specified as
base < options < util < expr < smt_util < libcvc4 < parsers < main
The distinction between "base < options < util < expr" are currently clean. The relationship between expr and the subsequent directories/libraries are not yet clean.
More details about the directories:
base/
The new directory base/ contains the shared utilities that are absolutely crucial to starting cvc4. The list currently includes just: cvc4_assert.{h,cpp}, output.{h,cpp}, exception.{h,cpp}, and tls.{h, h.in, cpp}. These are things that are required everywhere.
options/
The options/ directory is self contained.
- It contains all of the enums that appear as options. This includes things like theory/bv/bitblast_mode.h .
- There are exactly 4 classes that handled currently using forward declarations currently to this: LogicInfo, LemmaInputChannel, LemmaOutputChannel, and CommandSequence. These will all be removed from options.
- Functionality of the options_handlers.h files has been moved into smt/smt_options_handler.h. The options library itself only uses an interface class defined in options/options_handler_interface.h. We are now using virtual dispatch to avoid using inlined functions as was previously done.
- The */options_handlers.h files have been removed.
- The generated smt/smt_options.cpp file has been be replaced by pushing the functionality that was generated into: options/options_handler_{get,set}_option_template.cpp . The non-generated functionality was moved into smt_engine.cpp.
- All of the options files have been moved from their directories into options/. This means includes like theory/arith/options.h have changed to change to options/arith_options.h .
util/
The util/ directory continues to contain core utility classes that may be used [almost] everywhere. The exception is that these are not used by options/ or base/. This includes things like rational and integer. These may not use anything in expr/ or libcvc4. A number of files have been moved out of this directory as they have cyclic dependencies graph with exprs and types. The build process up to this directory is currently clean.
expr/
The expr/ directory continues to be the home of expressions. The major change is files moving from util/ moving into expr/. The reason for this is that these files form a cycle with files in expr/.
- An example is datatype.h. This includes "expr/expr.h", "expr/type.h" while "expr/command.h" includes datatype.h.
- Another example is predicate.h. This uses expr.h and is also declared in a kinds file and thus appears in kinds.h.
- The rule of thumb is if expr/ pulls it in it needs to be independent of expr/, in which case it is in util/, or it is not, in which case it is pulled into expr/.
- Some files do not have a strong justification currently. Result, ResourceManager and SExpr can be moved back into util/ once the iostream manipulation routines are refactored out of the Node and Expr classes.
- Note the kinds files are expected to remain in the theory/ directories. These are only read in order to build sources.
- This directory is not yet clean. It contains forward references into libcvc4 such as the printer. It also makes some classes used by main/ and parser CVC4_PUBLIC.
smt_util/
The smt_util/ directory contains those utility classes which require exprs, but expr/ does not require them. These are mostly utilities for working with expressions and nodes. Examples include ite_removal.h, LemmaInputChannel and LemmaOutputChannel.
What is up next:
- A number of new #warning "TODO: ..." items have been scattered throughout the code as reminders to myself. Help with these issues is welcomed.
- The expr/ directory needs to be cleaned up in a similar to options/. Before this happens statistics needs to be cleaned up.
ajreynol [Thu, 10 Dec 2015 12:32:42 +0000 (13:32 +0100)]
Add option fmf-empty-sorts.
Tim King [Fri, 4 Dec 2015 04:46:48 +0000 (23:46 -0500)]
Reverting a previous change to the options_handlers.h. Using inline defintions again to better handle a circular dependency.
Tim King [Thu, 3 Dec 2015 21:54:15 +0000 (13:54 -0800)]
Removing the generated directory from the parsers.
Tim King [Thu, 3 Dec 2015 06:33:26 +0000 (01:33 -0500)]
Modifying the src/options/Makefile.am for travis.
Tim King [Thu, 3 Dec 2015 05:29:39 +0000 (21:29 -0800)]
Modifying options/Makefile.am to pass distcheck. There is an unpleasant hack in this fix.
Chris Conway [Wed, 2 Dec 2015 21:56:52 +0000 (13:56 -0800)]
Adds Google, Inc. to the AUTHORS file.
ajreynol [Wed, 2 Dec 2015 16:45:07 +0000 (17:45 +0100)]
Minor fixes for cegqi-si-partial.
Tim King [Tue, 1 Dec 2015 06:55:26 +0000 (01:55 -0500)]
Separating the steps of the old mkoptions script into smaller phases.
Tim King [Sat, 28 Nov 2015 05:28:43 +0000 (00:28 -0500)]
Guarding the destruction of the a linux specific variable on WIN32.
Tim King [Wed, 2 Dec 2015 04:54:15 +0000 (20:54 -0800)]
Merge pull request #79 from CVC4/fix-mac-build-script
Adds required steps to contrib/mac-build.
Chris Conway [Tue, 1 Dec 2015 19:36:07 +0000 (11:36 -0800)]
Adds attempt to download config.guess to get-antlr-3.4 script.
This should work around the case where autogen.sh hasn't been run,
as long as the download succeeds.
Chris Conway [Tue, 1 Dec 2015 19:32:06 +0000 (11:32 -0800)]
Reverts addition of autogen.sh to mac-build script.
The file autogen.sh isn't present in dist tarballs so this will
break some users.
ajreynol [Tue, 1 Dec 2015 14:02:08 +0000 (15:02 +0100)]
More work on --cegqi-si-partial, incomplete.
ajreynol [Sat, 28 Nov 2015 11:48:18 +0000 (12:48 +0100)]
Initial work on --cegqi-si-partial, refactoring.
Chris Conway [Thu, 26 Nov 2015 22:57:03 +0000 (14:57 -0800)]
Adds required steps to contrib/mac-build.
autogen.sh must be run before get-antlr-3.4 or it fails with
I need the file config/config.guess to tell MACHINE_TYPE
autogen.sh can't run unless the autoconf, automake and libtools
MacPorts packages are installed.
ajreynol [Thu, 26 Nov 2015 16:08:45 +0000 (17:08 +0100)]
Update to new implementation of single invocation partition by default.
ajreynol [Thu, 26 Nov 2015 13:08:33 +0000 (14:08 +0100)]
Front-end support for get-value of sort cardinality, minor fixes for sygus solution reconstruction.
ajreynol [Wed, 25 Nov 2015 17:19:57 +0000 (18:19 +0100)]
Infrastructure for partially single invocation properties. Bug fix for unconstrained functions in sygus solver.
Tim King [Mon, 23 Nov 2015 21:27:14 +0000 (13:27 -0800)]
Adding a missing delete to smt2_compliance.
Tim King [Mon, 23 Nov 2015 21:28:52 +0000 (13:28 -0800)]
Adding a missing delete to InstStrategyCegqi destructor.
Tim King [Tue, 24 Nov 2015 00:30:24 +0000 (16:30 -0800)]
Isolating the dependencies on CVC4_ANTLR3_OLD_INPUT_STREAM. Also freeing more memory for antlr input.
Tim King [Tue, 24 Nov 2015 04:38:32 +0000 (20:38 -0800)]
Switching travis over to using the containers infrastructure.
Tim King [Fri, 13 Nov 2015 17:53:19 +0000 (09:53 -0800)]
Freeing memory allocated for signal handling.
ajreynol [Wed, 18 Nov 2015 10:50:47 +0000 (11:50 +0100)]
Option for midpoints in cbqi.
ajreynol [Tue, 17 Nov 2015 15:41:56 +0000 (16:41 +0100)]
Improve relevant domain computation for arithmetic, full saturation strategy. Simply E-matching trigger selection, do not use non-trivial triggers unless necessary. Add option to strings.
Tim King [Thu, 12 Nov 2015 14:58:40 +0000 (06:58 -0800)]
Updating the contrib/new-theory script and travis to use the new Makefile.theories script.
Tim King [Thu, 12 Nov 2015 12:23:08 +0000 (04:23 -0800)]
Updating the contrib/new-theory script and travis to use the new Makefile.theories script.
ajreynol [Thu, 12 Nov 2015 10:00:44 +0000 (11:00 +0100)]
Minor fixes and improvements to purify quant, relational triggers.
ajreynol [Wed, 11 Nov 2015 09:54:32 +0000 (10:54 +0100)]
Minor fixes to cbqi, purify-quant. Better error checking in addInstantiation.
ajreynol [Tue, 10 Nov 2015 13:35:25 +0000 (14:35 +0100)]
Fix infinite loop in datatype enumerator. Minor fixes and improvements to cbqi, full saturate. Add option --purify-quant. Use disequality triggers when using relational triggers. Add regressions.
Tim King [Mon, 9 Nov 2015 19:16:47 +0000 (11:16 -0800)]
Replacing an inefficient use of std::find(...) to use std::set's find() instead.
Tim King [Sat, 7 Nov 2015 06:53:53 +0000 (22:53 -0800)]
Changing file permissions to add or remove executable tag as appropriate.
Tim King [Thu, 5 Nov 2015 22:56:49 +0000 (14:56 -0800)]
Merging the google branch back into master.
Tim King [Thu, 5 Nov 2015 22:18:03 +0000 (14:18 -0800)]
Fixes some initialization and desctruction problems in quantifiers. Also restricts the desctructors of some components to not throw exceptions for pickier compiliers. Also changes some formatting of regression scripts.
Tim King [Thu, 5 Nov 2015 08:08:45 +0000 (00:08 -0800)]
This commit slightly generalizes the scripts for generating the _tags files.
ajreynol [Wed, 4 Nov 2015 09:41:49 +0000 (10:41 +0100)]
Better combination of UF with cbqi, refactor quantifiers intialization.
Tim King [Wed, 4 Nov 2015 07:20:04 +0000 (23:20 -0800)]
Fixing typo.
Tim King [Mon, 2 Nov 2015 22:30:52 +0000 (17:30 -0500)]
Adding a test to ensure the <build>/src/theory directory is available to the scripts in src/Makefile.am. This should fix a bug in building the debian packages.
ajreynol [Sat, 31 Oct 2015 09:00:52 +0000 (10:00 +0100)]
Improvements to handling of mixed Int/Real quantifiers.
Tim King [Fri, 30 Oct 2015 00:42:52 +0000 (17:42 -0700)]
Removes an extra dollar sign from src/options/mktagheaders. The extra dollar sign came in as a copy paste from a Makefile. This was not proper bash.
Tim King [Tue, 27 Oct 2015 06:59:54 +0000 (02:59 -0400)]
Adding the new mkdirs script to EXTRA_DIST. This should fix the failing nightly distcheck.
Tim King [Mon, 26 Oct 2015 19:21:42 +0000 (12:21 -0700)]
This commit fixes a bug related to a public header depending on a compiler flag. This resulted in user code seeing a different size for the SmtEngine class than what was compiled in the library. Proofs are enabled by default again. See cvc4.cs.nyu.edu/bugs/show_bug.cgi?id=688 for more information.
Tim King [Sat, 24 Oct 2015 01:31:30 +0000 (18:31 -0700)]
This commit removes using absolute paths in the generation of the .subdirs file. This also rearranges generation of the file so that one .subdirs file is generated once per Makefile.am file. This keeps using relative paths clean.
Tim King [Sat, 24 Oct 2015 00:47:11 +0000 (17:47 -0700)]
This commit moves the scripts for building the Debug_tags, Traces_tags, Debug_tags.h and Trace_tags.h out of options/Makefile.am and into seperate scripts. This also enables these files always being created.
Tim King [Fri, 23 Oct 2015 23:57:48 +0000 (16:57 -0700)]
This fixes a one definition rule violation for reduceDB_lt in Solver.cc in minisat and bvminisat. This also moves BVMinisat into CVC4. This also wrapped code in cpp files into the namespaces instead of having using namespace *.
ajreynol [Mon, 26 Oct 2015 15:11:00 +0000 (16:11 +0100)]
Promote InstStrategyCbqi to quantifier module. Cleanup unused code.
ajreynol [Mon, 26 Oct 2015 10:26:13 +0000 (11:26 +0100)]
Extend counterexample-guided instantiation to extended theory of Int/Real, mixed Int/Real. Bug fixes. Updates to quantifiers rewriter.
Kshitij Bansal [Sun, 25 Oct 2015 01:12:45 +0000 (21:12 -0400)]
Revert "Default builds are now proof enabled."
This reverts commit
4fd18dee3156a6dd1903b95662034d6e996ff88b.
ajreynol [Sat, 24 Oct 2015 09:41:22 +0000 (11:41 +0200)]
Fixes related to string contains.
Tim King [Fri, 23 Oct 2015 22:43:27 +0000 (15:43 -0700)]
This removes a bug for reading data that has been popped from the back of a vector using a stale reference in the unconstrained simplifier.
Tim King [Fri, 23 Oct 2015 22:35:57 +0000 (15:35 -0700)]
Specify that the default initialization must always be done for CDOhash_map's data field. Without doing this, there exists a loop where uninitialized data can be read. This can happen if T is a type like bool. The trace goes: CDOhash_map::set(data) calls ContextObj::make_current(). Now (d_pScope->isCurrent()) is false. So ContextObj::make_current() calls ContextObj::update(). ContextObj::update() calls CDOhash_map::save(). CDOhash_map::save() calls return new(pCMM) CDOhash_map(*this) which calls the copy constructor which reads the data using d_data(other.d_data).
Tim King [Fri, 23 Oct 2015 22:11:57 +0000 (15:11 -0700)]
Switching Options::current() to return a pointer. This helps avoid undefined behavior due to dereferencing a null pointer in the future.
Tim King [Fri, 23 Oct 2015 21:16:39 +0000 (14:16 -0700)]
Changes configure.ac so that the single recurisve invocation runs with a relative path. This lets the @srcdir@ variable in configuration be a relative path.
Tim King [Sat, 24 Oct 2015 02:03:24 +0000 (19:03 -0700)]
This patch slightly generalizes how the std::isfinite function in <cmath> is referred.
ajreynol [Thu, 22 Oct 2015 09:01:05 +0000 (11:01 +0200)]
Enable counterexample-guided quantifier instantiation by default for quantified logics that include at least one relevant theory. Enforce restriction on model building to last call. Update options, refactor. Update regressions.
ajreynol [Wed, 21 Oct 2015 08:47:52 +0000 (10:47 +0200)]
Minor refactoring in strings related to length.
ajreynol [Tue, 20 Oct 2015 10:49:49 +0000 (12:49 +0200)]
Refactor strings, remove old cycle checks in normalize eqc.
ajreynol [Mon, 19 Oct 2015 22:34:50 +0000 (00:34 +0200)]
Clean up explanations involving string length. Add regression.
ajreynol [Mon, 19 Oct 2015 16:10:02 +0000 (18:10 +0200)]
Improve stratification of strings extended function reductions, add regressions. Eliminate preprocess for regexp.
ajreynol [Mon, 19 Oct 2015 13:06:22 +0000 (15:06 +0200)]
Improve regexp rewriter, simplify regexp preprocess, add basic trans closure for string contains, refactoring.
ajreynol [Sun, 18 Oct 2015 10:17:00 +0000 (12:17 +0200)]
Fix for no condense func values.
ajreynol [Fri, 16 Oct 2015 16:26:34 +0000 (18:26 +0200)]
Add option to interleave enumerative instantiation with other strategies.
ajreynol [Fri, 16 Oct 2015 12:27:15 +0000 (14:27 +0200)]
Throw error for recursively defined types involving Boolean.
ajreynol [Fri, 16 Oct 2015 09:17:00 +0000 (11:17 +0200)]
Fix for codatatype constant rewrite, add regression.
ajreynol [Thu, 15 Oct 2015 15:58:35 +0000 (17:58 +0200)]
Fix congruence check in strings, fixes bug 686.
ajreynol [Thu, 15 Oct 2015 13:57:03 +0000 (15:57 +0200)]
Change semantics of str.substr to allow endpoint out of bounds, and return empty string for error conditions. Improve rewriter for str.substr.
ajreynol [Thu, 15 Oct 2015 09:43:14 +0000 (11:43 +0200)]
Decompose string contains, minor refactoring.
Kshitij Bansal [Wed, 14 Oct 2015 02:21:20 +0000 (22:21 -0400)]
Merge pull request #77 from kbansal/macsegfault
remove options infrastructure code which depended on undefined behavior
Kshitij Bansal [Tue, 13 Oct 2015 23:59:22 +0000 (19:59 -0400)]
remove options infrastructure code which depended on undefined behavior
appears to be source of crashes on mac
Kshitij Bansal [Mon, 12 Oct 2015 05:09:40 +0000 (01:09 -0400)]
Merge pull request #76 from CVC4/proofs
Proofs
Kshitij Bansal [Sun, 11 Oct 2015 23:20:16 +0000 (19:20 -0400)]
fix regression tests, support fallback mode for proofs
Liana Hadarean [Wed, 7 Oct 2015 18:56:02 +0000 (19:56 +0100)]
Default builds are now proof enabled.
ajreynol [Sun, 11 Oct 2015 13:35:14 +0000 (15:35 +0200)]
Fix strings preprocessing + incremental, fixes bug 682. Add initial infrastructure for str.contains inferences.
Liana Hadarean [Fri, 9 Oct 2015 09:26:09 +0000 (10:26 +0100)]
Temporary reverting commit
477e72b (proofs as default build) until we fix nightly builds.
ajreynol [Thu, 8 Oct 2015 21:57:50 +0000 (23:57 +0200)]
Minor improvements to strings. Refactor rewriter. Enable fairness for multiple sorts in UF finite model finding by default.
Liana Hadarean [Wed, 7 Oct 2015 18:56:02 +0000 (19:56 +0100)]
Default builds are now proof enabled.
Liana Hadarean [Wed, 7 Oct 2015 16:02:05 +0000 (17:02 +0100)]
Disabled donePPSimpITE when unsat-cores are enabled (fixes bug648)
ajreynol [Wed, 7 Oct 2015 10:54:55 +0000 (12:54 +0200)]
Minor improvements, add endpoint eq inference to strings.
ajreynol [Tue, 6 Oct 2015 11:26:03 +0000 (13:26 +0200)]
More improvements to strings rewriter for regexps, contains, indexof, replace and others. Enable non-recursive flat form inferences in strings theory solver. Refactor extf reductions. Use non-constant length terms when checking length equality. Add option --strings-eager-len.
ajreynol [Fri, 2 Oct 2015 21:15:35 +0000 (23:15 +0200)]
Fixes related to explanations for cycles, sym inferences. Minor fixes and improvements.
ajreynol [Fri, 2 Oct 2015 13:10:10 +0000 (15:10 +0200)]
Improvements to rewriter for regexp, contains, indexof. Improvements and fixes for reduction of indexof. Fixes bugs 612 and 615. Fix bug in find+offset in strings util. Add regressions.
ajreynol [Thu, 1 Oct 2015 15:57:37 +0000 (17:57 +0200)]
Evaluate extended operators on partially concrete arguments. More aggressive rewriting. Bug fix explanations for inferences. Avoid spurious cardinality splits. Do not do disequality splits for non-disequal terms. Work towards non-recursive handling of flat forms.
ajreynol [Thu, 1 Oct 2015 08:44:13 +0000 (10:44 +0200)]
More improvements to strings. More aggressive inference of constant eqc, reductions based on congruence, precheck for cycles.
ajreynol [Wed, 30 Sep 2015 08:24:15 +0000 (10:24 +0200)]
Refactor strings, bug fix inferences vs lemmas.
ajreynol [Tue, 29 Sep 2015 13:17:03 +0000 (15:17 +0200)]
Fix for fmf+incremental. Restrict cbqi to literals from ce body. Add regressions.
ajreynol [Mon, 28 Sep 2015 14:18:32 +0000 (16:18 +0200)]
Improve quantifiers engine wrt incremental presolve. Add regressions.
ajreynol [Mon, 28 Sep 2015 12:57:59 +0000 (14:57 +0200)]
Minor fix
ajreynol [Mon, 28 Sep 2015 12:12:48 +0000 (14:12 +0200)]
Minor fixes to strings, add regressions.
ajreynol [Mon, 28 Sep 2015 08:56:28 +0000 (10:56 +0200)]
Add missing regression
ajreynol [Mon, 28 Sep 2015 08:47:09 +0000 (10:47 +0200)]
Fix bug for trivial extf inferences in strings. Improve caching for splits in strings. Other improvements.
ajreynol [Sun, 27 Sep 2015 11:20:03 +0000 (13:20 +0200)]
Improved handling of extended operators. Do preprocess on memberships eagerly, only process contains/memberships that have non-constant arguments. Cleanup.
ajreynol [Sat, 26 Sep 2015 12:35:40 +0000 (14:35 +0200)]
Lazy preprocessing of extended operators in strings. Add regressions. Fixes bug 613.
ajreynol [Sat, 26 Sep 2015 08:04:34 +0000 (10:04 +0200)]
Better organization of quantifiers modules, promote full saturation to module. Add heuristics for cbqi LIA instantiation with coefficients.