Tim King [Tue, 21 Aug 2018 19:58:05 +0000 (12:58 -0700)]
Add constexpr annotations to help coverity understand constant ... (#2314)
Andrew Reynolds [Tue, 21 Aug 2018 17:10:38 +0000 (12:10 -0500)]
Use cbqi-full for sygus (#2346)
Andres Noetzli [Tue, 21 Aug 2018 03:23:09 +0000 (20:23 -0700)]
Remove support for *.expect files in regressions (#2341)
Currently, we can optionally specify an *.expect file with the metadata
of a regression test. This commit removes that option because it was not
widely used, adds maintenance overhead and makes the transition to a new
build system more cumbersome. Regression files can still be fed to a
solver without removing the metadata first since they are in comments of
the corresponding input format (note that this was not always the case,
it changed in
efc6163629c6c5de446eccfe81777c93829995d5).
Aina Niemetz [Tue, 21 Aug 2018 02:13:49 +0000 (19:13 -0700)]
Fix initialization of d_smt in ValidityChecker for changes from #2240. (#2343)
Aina Niemetz [Tue, 21 Aug 2018 01:40:25 +0000 (18:40 -0700)]
Remove disabled system test cvc3_george. (#2342)
Disabled since 6 years, @mdeters commented when disabling it that it takes a very long time to build, see
868ee6d.
Andrew Reynolds [Tue, 21 Aug 2018 00:22:21 +0000 (19:22 -0500)]
More unused code elimination (#2339)
Andrew Reynolds [Mon, 20 Aug 2018 23:40:40 +0000 (18:40 -0500)]
Remove support for prototype (non-sygus) synthesis (#2338)
Andrew Reynolds [Mon, 20 Aug 2018 23:05:43 +0000 (18:05 -0500)]
Add regressions that increase coverage (#2337)
Andrew Reynolds [Mon, 20 Aug 2018 21:29:30 +0000 (16:29 -0500)]
Minor improvements to the interface for sygus sampler (#2326)
Andrew Reynolds [Mon, 20 Aug 2018 17:21:37 +0000 (12:21 -0500)]
Make sygus inference a preprocessing pass (#2334)
Aina Niemetz [Sat, 18 Aug 2018 07:03:47 +0000 (00:03 -0700)]
run-regress script: Exit with exit code > 0 on failure. (#2336)
This is in preparation for migration to cmake since ctest determines failure via exit code.
Andrew Reynolds [Fri, 17 Aug 2018 20:09:05 +0000 (15:09 -0500)]
Remove support for flipDecision (#2319)
Andrew Reynolds [Fri, 17 Aug 2018 19:18:16 +0000 (14:18 -0500)]
Remove miscellaneous unused code (#2333)
Andrew Reynolds [Fri, 17 Aug 2018 18:29:15 +0000 (13:29 -0500)]
Add sygus stream regressions (#2330)
Andrew Reynolds [Fri, 17 Aug 2018 17:37:19 +0000 (12:37 -0500)]
Split sygus grammar to its own ANTLR grammar (#2307)
Andrew Reynolds [Fri, 17 Aug 2018 17:08:48 +0000 (12:08 -0500)]
Fix spurious warning in sort inference (#2331)
Andrew Reynolds [Fri, 17 Aug 2018 16:15:08 +0000 (11:15 -0500)]
Fix arithmetic division by zero in sygus repair constant module (#2329)
Andrew Reynolds [Fri, 17 Aug 2018 07:48:22 +0000 (02:48 -0500)]
Eliminate partial operators in sygus grammar normalization (#2323)
This corrects a bug that was introduced in #2266 (the hack removed there was necessary).
This ensures that we handle operators like bvudiv, bvsdiv, bvurem, div, rem, / properly in sygus.
This also enables total semantics for BV div-by-zero for sygus.
Tim King [Fri, 17 Aug 2018 06:48:17 +0000 (23:48 -0700)]
Initialize inputAssertions only when proofRecipe is non-null (#2325)
Most of the PR is clang-format cruft from picking up the contents of a PROOF({ ... });
Mathias Preiner [Fri, 17 Aug 2018 06:07:49 +0000 (23:07 -0700)]
Refactor eager atoms preprocessing pass. (#2318)
Haniel Barbosa [Fri, 17 Aug 2018 05:06:48 +0000 (00:06 -0500)]
cleaning unnecessary timers/dumps (#2327)
Haniel Barbosa [Fri, 17 Aug 2018 04:01:05 +0000 (23:01 -0500)]
Adding support for bitvector SyGuS problems without grammars (#2328)
Caleb Donovick [Fri, 17 Aug 2018 03:16:00 +0000 (20:16 -0700)]
Make quantifiers-preprocess preprocessing pass (#2322)
Tim King [Fri, 17 Aug 2018 02:37:38 +0000 (19:37 -0700)]
Removing coverity warnings from theory_sep.cpp (#2320)
Andres Noetzli [Fri, 17 Aug 2018 01:57:24 +0000 (18:57 -0700)]
Refactor IteRemoval preprocessing pass (#1793)
This commit refactors the IteRemoval pass to follow the new format.
In addition to moving the code, this entails the following changes:
- The timer for the ITE removal is now called differently (the default
timer of PreprocessingPass is used) and measures just the
preprocessing pass without applySubstitutions(). It also measures the
time used by both invocations of the ITE removal pass.
- Debug output will be slightly different because we now just rely on
the default functionality of PreprocessingPass.
- d_iteRemover is now passed into the PreprocessingPassContext.
- AssertionPipeline now owns the d_iteSkolemMap, which makes it
accessible by preprocessing passes. The idea behind this is that the
preprocessing passes collect information in AssertionPipeline and
d_iteSkolemMap fits that pattern.
Andres Noetzli [Thu, 16 Aug 2018 23:46:05 +0000 (16:46 -0700)]
Move node algorithms to separate file (#2311)
Andrew Reynolds [Thu, 16 Aug 2018 21:57:50 +0000 (16:57 -0500)]
Minor fixes and improvement for sygus to builtin. (#2306)
Haniel Barbosa [Thu, 16 Aug 2018 21:15:07 +0000 (16:15 -0500)]
Refactor extended rewriter preprocessing pass (#2324)
Haniel Barbosa [Thu, 16 Aug 2018 16:18:11 +0000 (11:18 -0500)]
Refactor apply2const (#2316)
Tim King [Thu, 16 Aug 2018 01:09:45 +0000 (18:09 -0700)]
Switching an Assert to a CVC4_CHECK to test if it resolves CID
1459595. (#2315)
Tim King [Wed, 15 Aug 2018 22:49:15 +0000 (15:49 -0700)]
Removing attribute cleanups. (#2300)
* Removing attribute cleanups.
Mathias Preiner [Wed, 15 Aug 2018 21:34:12 +0000 (14:34 -0700)]
Add contrib/get-gmp script. (#2292)
Andres Noetzli [Wed, 15 Aug 2018 19:16:20 +0000 (12:16 -0700)]
Remove unused tuple classes (#2313)
Since we are using C++11, we can replace the triple and quad classes
with std::tuple.
Andres Noetzli [Wed, 15 Aug 2018 18:46:31 +0000 (11:46 -0700)]
Remove unused class DynamicArray (#2312)
Andrew Reynolds [Wed, 15 Aug 2018 18:02:46 +0000 (13:02 -0500)]
Make sort inference a preprocessing pass (#2309)
Andres Noetzli [Wed, 15 Aug 2018 16:37:00 +0000 (09:37 -0700)]
Fix dumping of get-unsat-assumptions (#2302)
When dumping a `get-unsat-assumptions` command, CVC4 was instead dumping
two `get-unsat-cores` commands. This commit splits
`SmtEngine::getUnsatCores()` into a part that does the dumping and an
internal part that actually gets the unsat core without dumping.
`SmtEngine::getUnsatAssumptions()` now calls the internal version to
avoid the redundant dumping of a `get-unsat-cores` command and changes
the command that gets dumped in `SmtEngine::getUnsatAssumptions()`.
Andres Noetzli [Wed, 15 Aug 2018 03:23:28 +0000 (20:23 -0700)]
Remove unused declaration (#2310)
Aina Niemetz [Tue, 14 Aug 2018 15:24:33 +0000 (08:24 -0700)]
autotools: Remove personal builds, rename build 'default' to 'testing'. (#2303)
Andres Noetzli [Tue, 14 Aug 2018 01:03:54 +0000 (18:03 -0700)]
Fix get-unsat-assumptions output (#2301)
Fixes #2298. The `get-unsat-assumptions` command was printing the result
with square brackets and commas instead of parentheses and spaces
between the assumptions.
Tim King [Mon, 13 Aug 2018 16:25:26 +0000 (09:25 -0700)]
Removing support for T* and const T* attributes. (#2297)
* Removing support for T* and const T* attributes. These are unused.
Andres Noetzli [Sat, 11 Aug 2018 18:13:17 +0000 (11:13 -0700)]
Make attributes robust to static init orderings (#2295)
@taking pointed out that part of the issue fixed in #2293 is also that
we should be more robust to different (de-)initialization orders. A
common, portable way to achieve this is to allocate the object in
question on the heap and make the pointer to it static [0]. This commit
fixes the variable in question.
I have tested this fix in ASAN (without using --no-static-init flag for
CxxTest) and it works.
[0] https://isocpp.org/wiki/faq/ctors#construct-on-first-use-v2
Aina Niemetz [Fri, 10 Aug 2018 23:45:27 +0000 (16:45 -0700)]
Fix portfolio command executor for changes from #2240. (#2294)
Andres Noetzli [Fri, 10 Aug 2018 22:23:21 +0000 (15:23 -0700)]
Do not use static initialization in CxxTest runner (#2293)
The static initialization in the CxxTest runner was causing problems
when having `std::unique_ptr`s in test classes. When the ExprManager's
deconstructor is called, we count on certain static objects to be around
(e.g.
https://github.com/CVC4/CVC4/blob/
0a02fd2b69c0c0f454fc33d8028b24f4fcf431de/src/expr/attribute_internals.h#L508).
If the ExprManager is (indirectly) owned by a `std::unique_ptr` in a
static class, however, there are no such guarantees as the destruction
order of static objects is not defined. This commit adds a flag for
CxxTest to not use static initialization in the test runner, which
solves the issue. Additionally, the commit fixes a warning about a
missing virtual deconstructor in ParserBlack that came up after using
the new flags.
This fixes an issue reported in the nightly builds.
Andrew Reynolds [Thu, 9 Aug 2018 20:11:27 +0000 (15:11 -0500)]
Fix char overflow issues in regular expression solver (#2275)
Andres Noetzli [Thu, 9 Aug 2018 18:43:00 +0000 (11:43 -0700)]
Fix documentation of regression tests (#2290)
Aina Niemetz [Thu, 9 Aug 2018 02:21:47 +0000 (19:21 -0700)]
Plug solver API object into parser. (#2240)
Tim King [Thu, 9 Aug 2018 00:44:00 +0000 (17:44 -0700)]
Fixing documentation nit from PR#2232. (#2289)
Tim King [Wed, 8 Aug 2018 23:50:16 +0000 (16:50 -0700)]
Proposal for adding map utility functions to CVC4. (#2232)
* Proposal for adding map utility functions to CVC4.
Andrew Reynolds [Wed, 8 Aug 2018 22:09:18 +0000 (17:09 -0500)]
Disable argument relevance for sygus by default (#2288)
Andrew Reynolds [Wed, 8 Aug 2018 20:57:45 +0000 (15:57 -0500)]
Add debug test for sygus subcall verify calls. (#2287)
Andrew Reynolds [Wed, 8 Aug 2018 18:09:19 +0000 (13:09 -0500)]
Move uf model code from uf to quantifiers (#2095)
Andrew Reynolds [Wed, 8 Aug 2018 17:08:20 +0000 (12:08 -0500)]
Do beta-reduction in expandDefinitions (#2286)
Andres Noetzli [Wed, 8 Aug 2018 06:24:07 +0000 (23:24 -0700)]
Require Swig 3 (#2283)
Removes some hacks due to Swig 2's incomplete C++11 support and adds
checks for version 3 at configuration time as well as in swig.h
Andrew Reynolds [Wed, 8 Aug 2018 05:51:13 +0000 (00:51 -0500)]
Simplify and improve the sygus parser (#2266)
Currently, there is code duplication for parsing constants in sygus grammars, e.g.:
https://github.com/CVC4/CVC4/blob/master/src/parser/smt2/Smt2.g#L1048
https://github.com/CVC4/CVC4/blob/master/src/parser/smt2/Smt2.g#L2304
This PR removes this duplication by introducing a new ANTLR grammar "termAtomic" in Smt2.g.
As a result of this PR, we now parse sygus grammars with any constant we otherwise parse. This addresses known issues where CVC4 rejects grammars with floating point constants.
It also removes some unnecessary code for converting builtin kinds to their total versions.
This is work towards #2197. We still do not support sygus grammars with non-trivial *composite* terms, such as applications of indexed function symbols.
Andrew Reynolds [Wed, 8 Aug 2018 04:03:57 +0000 (23:03 -0500)]
Document/refactor datatypes sygus simple symmetry breaking (#2233)
Andrew Reynolds [Wed, 8 Aug 2018 03:06:19 +0000 (22:06 -0500)]
Fix simple reg exp consume rewrite (#2281)
Andres Noetzli [Wed, 8 Aug 2018 00:26:58 +0000 (17:26 -0700)]
Delete functions instead of using CVC4_UNDEFINED (#1794)
C++11 supports explicitly deleting functions that should not be used
(explictly or implictly), e.g. copy or assignment constructors. We were
previously using the CVC4_UNDEFINED macro that used a compiler-specific
attribute. The C++11 feature should be more portable.
Andrew Reynolds [Tue, 7 Aug 2018 22:57:39 +0000 (17:57 -0500)]
Wait to do sygus qe preprocess until full effort check (#2282)
Andrew Reynolds [Tue, 7 Aug 2018 22:34:00 +0000 (17:34 -0500)]
Fix inference of pre and post conditions for non variable arguments. (#2237)
Mathias Preiner [Tue, 7 Aug 2018 20:18:44 +0000 (13:18 -0700)]
Make output of flushInformation and safeFlushInformation consistent. (#2280)
Aina Niemetz [Tue, 7 Aug 2018 18:22:05 +0000 (11:22 -0700)]
Add rewrite for nested BITVECTOR_ITE that can be merged. (#2273)
Andrew Reynolds [Tue, 7 Aug 2018 04:04:21 +0000 (23:04 -0500)]
Make flat form inferences optional in strings (#2277)
Andrew Reynolds [Tue, 7 Aug 2018 03:39:21 +0000 (22:39 -0500)]
Add RegLan to smt2/sygus parsers. (#2276)
Andrew Reynolds [Tue, 7 Aug 2018 02:44:41 +0000 (21:44 -0500)]
Move sygus quantifier elimination step for non-ground-single-invocation to sygus (#2269)
Andrew Reynolds [Tue, 7 Aug 2018 01:28:15 +0000 (20:28 -0500)]
Remove support for Enum sygus syntax. (#2264)
Andrew Reynolds [Mon, 6 Aug 2018 23:55:29 +0000 (18:55 -0500)]
Fixes for sygus inference (#2238)
This includes:
- Enabling sygus-specific options in SmtEngine::setDefaults,
- Disabling a variant of miniscoping (triggered by many chc-comp18 benchmarks),
- Treating free constants as functions to synthesize
Andrew Reynolds [Mon, 6 Aug 2018 22:33:23 +0000 (17:33 -0500)]
Fixes and improvements for single invocation inference (#2261)
Andrew Reynolds [Mon, 6 Aug 2018 21:36:23 +0000 (16:36 -0500)]
Fix degenerate case of sygus grammar construction for 0-argument Bools (#2260)
Aina Niemetz [Sat, 4 Aug 2018 02:41:49 +0000 (19:41 -0700)]
Add rewrite for nested BITVECTOR_ITE with cond_outer == cond_inner. (#2272)
Aina Niemetz [Sat, 4 Aug 2018 01:09:07 +0000 (18:09 -0700)]
Add rewrite for BITVECTOR_ITE with const children. (#2271)
Aina Niemetz [Fri, 3 Aug 2018 23:43:10 +0000 (16:43 -0700)]
Add rewrite for BITVECTOR_ITE with term_then == term_else. (#2268)
Andrew Reynolds [Fri, 3 Aug 2018 20:34:17 +0000 (15:34 -0500)]
Eliminate option for sygus UF evaluation functions (#2262)
Mathias Preiner [Fri, 3 Aug 2018 12:59:23 +0000 (05:59 -0700)]
Fix printing statistics in case of signals. (#2267)
Aina Niemetz [Fri, 3 Aug 2018 00:11:36 +0000 (17:11 -0700)]
Add timer for BV inequality solver. (#2265)
Andrew Reynolds [Thu, 2 Aug 2018 22:17:09 +0000 (17:17 -0500)]
Parse standard separation logic inputs (#2257)
Andrew Reynolds [Thu, 2 Aug 2018 20:29:45 +0000 (15:29 -0500)]
Improve CEGQI heuristics involving equality and multiple instantiations (#2254)
Andrew Reynolds [Thu, 2 Aug 2018 19:54:37 +0000 (14:54 -0500)]
Fix candidate rewrite utilities for non-first-class types (#2256)
Andrew Reynolds [Thu, 2 Aug 2018 19:16:48 +0000 (14:16 -0500)]
Make strings robust to regular expression variables. (#2255)
The theory solver for strings does not support regular expression variables. With this PR, we properly throw an exception if it is given one.
However, the rewriter needs to handle regular expression variables (for various reasons: rewriting an expression before its asserted, sygus explanation generalization, etc.). This corrects a few miscellaneous issues in the strings rewriter to make it sound for these cases.
It also corrects a seg fault in simpleRegexpConsume when testing memberships `(str.in.re "" R)`, where R is a *non-constant* regular expression (which will now be allowed if variables are allowed).
This is in preparation for adding `RegLan` as a token to the smt2/sygus parsers.
Aina Niemetz [Thu, 2 Aug 2018 18:52:32 +0000 (11:52 -0700)]
Add rewrites for BITVECTOR_ITE and BITVECTOR_COMP with const condition/child. (#2259)
Andrew Reynolds [Thu, 2 Aug 2018 18:01:50 +0000 (13:01 -0500)]
Remove references to deprecated propagate as decision feature (#2258)
Andres Noetzli [Thu, 2 Aug 2018 14:54:50 +0000 (07:54 -0700)]
Remove Subversion build info (#2250)
Andrew Reynolds [Thu, 2 Aug 2018 04:24:53 +0000 (23:24 -0500)]
Fix API call for reg exp. (#2248)
Andrew Reynolds [Thu, 2 Aug 2018 02:24:42 +0000 (21:24 -0500)]
Improvements and fixes in cegqi arithmetic (#2247)
This includes several improvements for cegqi with arithmetic:
- Randomly choose either lower or upper bounds instead of always using lower bounds (this is similar to cegqi+BV),
- Equalities are handled by processAssertions,
- Resort to *only* model values at full effort instead of trying to mix model values/bounds (this is also similar to cegqi+BV),
- cegqi+arithmetic does not try multiple instantiations unless the flag cbqiMultiInst is set. This makes it so that ceg_instantiator does not have exponential behavior when the strategy is non-monotonic.
It also includes a core fix to computing what bound is optimal based on an ordering that incorporates virtual terms. Previously, we would consider, e.g.:
`a+b*delta > c+d*delta if a>=c and b>=d`
Whereas the correct check is lexicographic:
`a+b*delta > c+d*delta if a>c or a=c and b>d`
This means e.g. 2+(-1)*delta > 3 was previously wrongly inferred.
This is part of merging https://github.com/ajreynol/CVC4/tree/cegqiSingleInst, which is +3-0 on SMTLIB BV and +12-9 on SMTLIB LIA+LRA+NRA+NIA.
Andres Noetzli [Thu, 2 Aug 2018 01:07:34 +0000 (18:07 -0700)]
Remove outdated references to TLS (#2245)
Andrew Reynolds [Thu, 2 Aug 2018 00:10:47 +0000 (19:10 -0500)]
Fix issues with printing parametric datatypes in smt2 (#2213)
Andres Noetzli [Wed, 1 Aug 2018 23:08:47 +0000 (16:08 -0700)]
Fix wrong evaluation of STRING_STOI (#2252)
Mathias Preiner [Wed, 1 Aug 2018 22:14:45 +0000 (15:14 -0700)]
Fix bool-to-bv preprocessing pass for non-{bv,bool} equalities. (#2251)
Aina Niemetz [Wed, 1 Aug 2018 19:08:02 +0000 (12:08 -0700)]
InteractiveShell: Remove redundant options argument. (#2244)
Aina Niemetz [Wed, 1 Aug 2018 18:36:30 +0000 (11:36 -0700)]
New C++ API: Fixed ownership of options object. (#2243)
Andrew Reynolds [Wed, 1 Aug 2018 17:22:09 +0000 (12:22 -0500)]
Fix issues with bv2nat (#2219)
This includes:
- A missing case in the smt2 printer,
- A bug in an inference of int2bv applied to bv2nat where the types are different.
Andrew Reynolds [Wed, 1 Aug 2018 15:33:41 +0000 (10:33 -0500)]
Fix assertion in conjecture generator (#2246)
Makes minor improvements and removes the need to have the assertion (which was incorrect).
This fixes the nightlies.
Andrew Reynolds [Wed, 1 Aug 2018 07:31:49 +0000 (02:31 -0500)]
Make conjecture generator's uf term enumeration safer (#2172)
This ensures that the function getEnumerateUfTerm does not have out of bounds accesses. This is an alternative fix to the one brought up in #2158.
Andrew Reynolds [Wed, 1 Aug 2018 06:31:14 +0000 (01:31 -0500)]
Make candidate rewrite match filtering handle polymorphic operators properly (#2236)
Currently, the discrimination tree index used for candidate rewrite rule filtering based on matching does not properly distinguish polymorphic operators, which leads to type errors. This makes the index handle them correctly.
Fixes #1923.
ayveejay [Wed, 1 Aug 2018 02:25:51 +0000 (03:25 +0100)]
Improvements and tests for the API around separation logic (#2229)
- Introduces a system that validating that, when not using THEORY_SEP, that it is not possible to
obtain the separation logic heap/nil (validate_exception())
- Introduces a system test demonstrating how to use the separation logic theory, and then how
to use the "getters" to obtain and interrogate the heap/nil expressions (validate_getters())
- Refactors the original getters to avoid duplicate code
- Add a check as part of the getters to ensure that THEORY_SEP is in use
Mathias Preiner [Wed, 1 Aug 2018 00:51:15 +0000 (17:51 -0700)]
Remove hasAssertions() method from eager BV solver. (#2239)
Mathias Preiner [Tue, 31 Jul 2018 18:25:27 +0000 (11:25 -0700)]
Fix option handler for lazy/bv-sat-solver combinations. (#2225)
Further, unifies all *limitHandler and *limitPerHandler to limitHandler.
Mathias Preiner [Mon, 30 Jul 2018 22:24:55 +0000 (15:24 -0700)]
Add support for incremental eager bit-blasting. (#1838)
Eager incremental solving is achieved via solving under assumptions. As soon as incremental and eager bit-blasting is enabled, assertions are passed to the SAT solver as assumptions rather than assertions. This requires the eager SAT solver to support incremental solving, which is currently only supported by CryptoMiniSat.
FabianWolff [Mon, 30 Jul 2018 16:28:11 +0000 (18:28 +0200)]
Fix several spelling errors (#2231)
Tim King [Mon, 30 Jul 2018 02:02:44 +0000 (19:02 -0700)]
Storing a std::pair<Key,Data> on CDOhash_map.
Changing the return type of CDHashMap::iterator* to return a reference. Requires performance testing.
Mathias Preiner [Fri, 27 Jul 2018 21:54:06 +0000 (14:54 -0700)]
Require argument description for non-{bool,void} options. (#2228)
Not adding the argument description for non-{bool,void} options is now an error.
Further, adds missing argument descriptions.