Merge from LFSC (#26)

* Showing models as coq counter examples in tactic without constructing coq terms

* also read models when calling cvc4 with a file (deactivated because cvc4 crashes)

* Show counter examples with variables in the order they are quantified in the Coq goal

* Circumvent issue with ocamldep

* fix issue with dependencies

* fix issue with dependencies

* Translation and OCaml support for extract, zero_extend, sign_extend

* Show run times of components

* print time on stdout instead

* Tests now work with new version (master) of CVC4

* fix small printing issue

* look for date on mac os x

* proof of valid_check_bbShl: some cases to prove.

* full proof of "left shift checker".

*  full proof of "rigth shift checker".

* Support translation of terms bvlshr, bvshl but LFSC rules do not exists at the moment
Bug fix for bitvector extract (inverted arguments)

* Typo

* More modularity on the format of traces depending on the version of coq

* More straightforward definitions in Int63Native_standard

* Use the Int31 library with coq-8.5

* Use the most efficient operations of Int31

* Improved performance with coq-8.5

* Uniform treatment of sat and smt tactics

* Hopefully solved the problem with universes for the tactic

* Updated the installation instructions

* Holes for unsupported bit blasting rules

* Cherry-picking from smtcoq/smtcoq

* bug fix hole for bitblast

* Predefined arrays are not required anymore

* fix issue with coq bbT and bitof construction from ocaml

* bug fix in smtAtom for uninterpreted functions
fix verit test file

* fix issue with smtlib2 extract parsing

* It looks like we still need the PArray function instances for some examples (see vmcai_bytes.smt2)

* Solver specific reification:
Each solver has a list of supported theories which is passed to Atom.of_coq, this function creates uninterpreted functions / sorts for unsupported features.

* show counter-examples with const_farray instead of const for constant array definitions

* Vernacular commands to debug checkers.
Verit/Lfsc_Checker_Debug will always fail, reporting the first proof step of the certificate that failed be checked

* Update INSTALL.md

* show smtcoq proof when converting

* (Hopefully) repared the universes problems

* Corrected a bug with holes in proofs

* scripts for tests:
create a folder "work" under "lfsc/tests/", locate the benchmarks there.
create a folder "results" under "lfsc/tests/work/" in which you'll find the results of ./cvc4tocoq.

* make sure to give correct path for your benchs...

* Checker for array extensionality modulo symmetry of equality

* fix oversight with bitvectors larger than 63 bits

* some printing functions for smt2 ast

* handle smtlib2 files with more complicated equivalence with (= ... )

* revert: ./cvc4tocoq does not output lfsc proofs...

* bug fix one input was ignored

* Don't show verit translation of LFSC proof if environment variable DONTSHOWVERIT is set
(e.g. put export DONTSHOWVERIT="" in your .bashrc or .bashprofile)

* Also sort names of introduced variables when showing counter-example

* input files for which SMTCoq retuns false.

* input files for which SMTCoq retuns false.

* use debug checker for debug file

* More efficient debug checker

* better approximate number of failing step of certificate in debug checker

* fix mistake in ml4

* very first attempt to support goals in Prop

* bvs: comparison predicates in Prop and their <-> proofs with the ones in bool
farrays: equality predicate in Prop and its <-> proof with the one in bool.

* unit, Bool, Z, Pos: comparison and equality predicates in Prop.

* a typo fixed.

* an example of array equality in  Prop (converted into Bool by hand)...
TODO: enhance the search space of cvc4 tactic.

* first version of cvc4' tactic: "solves" the goals in Prop.
WARNING: supports only bv and array goals and might not be complete
TODO: add support for lia goals

* cvc4' support for lia
WARNING: might not be complete!

* small fix in cvc4' and some variations of examples

* small fix + support for goals in Bool and Bool = true + use of solve tactical
WARNING: does not support UF and INT63 goals in Prop

* cvc4': better arrangement

* cvc4': Prop2Bool by context search...

* cvc4': solve tactial added -> do not modify unsolved goals.

* developer documentation for the smtcoq repo

* cvc4': rudimentary support for uninterpreted function goals in Prop.

* cvc4': support for goals with Leibniz equality...
WARNING: necessary use of "Grab Existential Variables." to instantiate variable types for farrays!

* cvc4': Z.lt adapted + better support from verit...

* cvc4': support for Z.le, Z.ge, Z.gt.

* Try arrays with default value (with a constructor for constant arrays), but extensionality is not provable

* cvc4': support for equality over uninterpreted types

* lfsc demo: goals in Coq's Prop.

* lfsc demo: goals in Bool.

* Fix issue with existential variables generated by prop2bool.
- prop2bool tactic exported by SMTCoq
- remove useless stuff

* update usage and installation instructions

* Update INSTALL.md

* highlighting

* the tactic: bool2prop.

* clean up

* the tactic smt: very first version.

* smt: return unsolved goals in Prop.

* Show when a certificate cannot be checked when running the tactic instead of at Qed

* Tactic improvements
- Handle negation/True/False in prop/bool conversions tactic.
- Remove alias for farray (this caused problem for matching on this type in tactics).
- Tactic `smt` that combines cvc4 and veriT.
- return subgoals in prop

* test change header

* smt: support for negated goals + some reorganization.

* conflicts resolved + some reorganization.

* a way to solve the issue with ambiguous coercions.

* reorganization.

* small change.

* another small change.

* developer documentation of the tactics.

* developer guide: some improvements.

* developer guide: some more improvements.

* developer guide: some more improvements.

* developer guide: some more improvements.

* pass correct environment for conversion + better error messages

* cleaning

* ReflectFacts added.

* re-organizing developers' guide.

* re-organizing developers' guide.

* re-organizing developers' guide.

* removing unused maps.

* headers.

* artifact readme getting started...

* first attempt

* second...

* third...

* 4th...

* 5th...

* 6th...

* 7th...

* 8th...

* 9th...

* 10th...

* 11th...

* 12th...

* 13th...

* 14th...

* 15th...

* 16th...

* 17th...

* Update artifact.md

Use links to lfsc repository like in the paper

* 18th...

* 19th...

* 20th...

* 21st...

* 22nd...

* 23rd...

* 24th...

* 25th...

* 26th...

* 27th...

* 28th...

* Update artifact.md

Small reorganization

* minor edits

* More minor edits

* revised description of tactics

* Final pass

* typo

* name changed: artifact-readme.md

* file added...

* passwd chaged...

* links...

* removal

* performance statement...

* typos...

* the link to the artifact image updated...

* suggestions by Guy...

* aux files removed...

* clean-up...

* clean-up...

* some small changes...

* small fix...

* additional information on newly created files after running cvc4tocoq script...

* some small fix...

* another small fix...

* typo...

* small fix...

* another small fix...

* fix...

* link to the artifact image...

* We do not want to force vm_cast for the Theorem commands

* no_check variants of the tactics

* TODO: a veriT test does not work anymore

* Compiles with both versions of Coq

* Test of the tactics in real conditions

* Comment on this case study

* an example for the FroCoS paper.

* Fix smt tactic that doesn't return cvc4's subgoals

* readme modifications

* readme modifications 2

* small typo in readme.

* small changes in readme.

* small changes in readme.

* typo in readme.

* Sync with https://github.com/LFSC/smtcoq

* Port to Coq 8.6

* README

* README

* INSTALL

* Missing file

* Yves' proposition for installation instructions

* Updated link to CVC4

* Compiles again with native-coq

* Compiles with both versions of Coq

* Command to bypass typechecking when generating a zchaff theorem

* Solved bug on cuts from Hole

* Counter-models for uninterpreted sorts (improves issue #13)

* OCaml version note (#15)

* update .gitignore

* needs OCaml 4.04.0

* Solving merge issues (under progress)

* Make SmtBtype compile

* Compilation of SmtForm under progress

* Make SmtForm compile

* Make SmtCertif compile

* Make SmtTrace compile

* Make SatAtom compile

* Make smtAtom compile

* Make CnfParser compile

* Make Zchaff compile

* Make VeritSyntax compile

* Make VeritParser compile

* Make lfsc/tosmtcoq compile

* Make smtlib2_genconstr compile

* smtCommand under progress

* smtCommands and verit compile again

* lfsc compiles

* ml4 compiles

* Everything compiles

* All ZChaff unit tests and most verit unit tests (but taut5 and un_menteur) go through

* Most LFSC tests ok; some fail due to the problem of verit; a few fail due to an error "Not_found" to investigate

* Authors and headings

* Compiles with native-coq

* Typo

1 files changed, 173 insertions, 30 deletions

diff --git a/src/trace/smtCertif.ml b/src/trace/smtCertif.ml
index 275f6d1..b1468e4 100644
--- a/src/trace/smtCertif.ml
+++ b/src/trace/smtCertif.ml
@@ -1,13 +1,9 @@
 (**************************************************************************)
 (*                                                                        *)
 (*     SMTCoq                                                             *)
-(*     Copyright (C) 2011 - 2016                                          *)
+(*     Copyright (C) 2011 - 2019                                          *)
 (*                                                                        *)
-(*     Michaël Armand                                                     *)
-(*     Benjamin Grégoire                                                  *)
-(*     Chantal Keller                                                     *)
-(*                                                                        *)
-(*     Inria - École Polytechnique - Université Paris-Sud                 *)
+(*     See file "AUTHORS" for the list of authors                         *)
 (*                                                                        *)
 (*   This file is distributed under the terms of the CeCILL-C licence     *)
 (*                                                                        *)
@@ -21,6 +17,11 @@ type used = int
 type clause_id  = int
 
 type 'hform rule =
+  (* Weakening *)
+  | Weaken of 'hform clause * 'hform list
+     (*  * weaken          : {a_1 ... a_n} --> {a_1 ... a_n b_1 ... b_n} *)
+
+  (* Simplification *)
   | ImmFlatten of 'hform clause * 'hform
 
   (* CNF Transformations *)
@@ -108,6 +109,114 @@ type 'hform rule =
   (* Elimination of operators *)
   | SplDistinctElim of 'hform clause * 'hform
 
+  (* Bit-blasting *)
+  | BBVar of 'hform
+  (* Bit-blasting a variable:
+
+       ----------------------- bbVar
+        bbT(x, [x0; ...; xn])
+   *)
+  | BBConst of 'hform
+  (* Bit-blasting a constant:
+
+       ----------------------- bbConst
+        bbT(#0100, [0; 0; 1; 0])
+   *)
+  | BBOp of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitwise operations: bbAnd, bbOr, ...
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbAnd
+             bbT(a&b, [a0 /\ b0; ...; an /\ bn])
+   *)
+  | BBNot of 'hform clause * 'hform
+  (* Bit-blasting bitvector not
+           bbT(a, [a0; ...; an])
+       ------------------------------ bbNot
+        bbT(not a, [~a0 ; ...; ~an])
+   *)
+  | BBNeg of 'hform clause * 'hform
+  (* Bit-blasting bitvector negation
+           bbT(a, [a0; ...; an])
+       ------------------------------ bbNot
+        bbT(-a, [...])
+   *)
+  | BBAdd of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector addition
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbAnd
+             bbT(a+b, [...])
+   *)
+  | BBMul of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector multiplication
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbAnd
+             bbT(a*b, [...])
+   *)
+  | BBUlt of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector unsigned comparison
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbAnd
+             bvult a b <-> ...
+   *)
+  | BBSlt of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector signed comparison
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbAnd
+             bvslt a b <-> ...
+   *)
+  | BBConc of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector concatenation
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbConc
+             bbT(concat a b, [a0; ...; an; b0; ...; bn])
+   *)
+  | BBExtr of 'hform clause * 'hform
+  (* Bit-blasting bitvector extraction
+             bbT(a, [a0; ...; an])
+       ----------------------------------- bbExtr
+        bbT(extract i j a, [ai; ...; aj])
+   *)
+  | BBZextn of 'hform clause * 'hform
+  | BBSextn of 'hform clause * 'hform
+  (* Bit-blasting bitvector extensions
+
+  *)
+  | BBShl of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector shift left *)
+  | BBShr of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting bitvector shift right *)
+  | BBEq of 'hform clause * 'hform clause * 'hform
+  (* Bit-blasting equality
+        bbT(a, [a0; ...; an])      bbT(b, [b0; ...; bn])
+       -------------------------------------------------- bbEq
+         (a = b) <-> [(a0 <-> b0) /\ ... /\ (an <-> bn)]
+   *)
+
+  | BBDiseq of 'hform
+  (* disequality over constant bitvectors
+
+       ----------------------------- bbDiseq
+         #b000010101 <> #b00000000
+   *)
+
+  | RowEq of 'hform
+  (* Read over write same index
+       ------------------------------- roweq
+         select (store a i v) i = v
+   *)
+
+  | RowNeq of 'hform list
+  (* Read over write other index
+       ------------------------------------------------- rowneq
+         i <> j -> select (store a i v) j = select a j
+   *)
+
+  | Ext of 'hform
+  (* Extensionality over arrays
+       ------------------------------------------------------- ext
+         a = b \/ select a (diff a b) <> select b (diff a b)
+   *)
+
   (* Possibility to introduce "holes" in proofs (that should be filled in Coq) *)
   | Hole of ('hform clause) list * 'hform list
   | Forall_inst of 'hform clause * 'hform
@@ -139,12 +248,26 @@ and 'hform resolution = {
 let used_clauses r =
   match r with
   | ImmBuildProj (c, _) | ImmBuildDef c | ImmBuildDef2 c
-  | ImmFlatten (c,_)  | SplArith (c,_,_) | SplDistinctElim (c,_)
-  | Forall_inst (c, _) | Qf_lemma (c, _) -> [c]
+
+  | Weaken (c,_) | ImmFlatten (c,_)
+  | SplArith (c,_,_) | SplDistinctElim (c,_)
+  | BBNot (c, _) | BBNeg (c, _) | BBExtr (c, _)
+  | BBZextn (c, _) | BBSextn (c, _) -> [c]
+
+  | BBOp (c1,c2,_) | BBAdd (c1,c2,_)
+  | BBMul (c1,c2,_) | BBConc (c1,c2,_)
+  | BBUlt (c1,c2,_) | BBSlt (c1,c2,_)
+  | BBShl (c1,c2,_) | BBShr (c1,c2,_)
+  | BBEq (c1,c2,_) -> [c1;c2]
+
   | Hole (cs, _) -> cs
+  | Forall_inst (c, _) | Qf_lemma (c, _) -> [c]
+
   | True | False | BuildDef _ | BuildDef2 _ | BuildProj _
   | EqTr _ | EqCgr _ | EqCgrP _
-  | LiaMicromega _ | LiaDiseq _ -> []
+  | LiaMicromega _ | LiaDiseq _
+  | BBVar _ | BBConst _ | BBDiseq _
+  | RowEq _ | RowNeq _ | Ext _ -> []
 
 (* For debugging certif processing purposes : <add_scertif> <select> <occur> <alloc> *)
 let to_string r =
@@ -158,27 +281,47 @@ let to_string r =
              "Res [" ^ id1 ^ "; " ^ id2 ^ rest_ids ^"]"
           | Other x -> "Other(" ^
                          begin match x with
-                         | True -> "True"
-                         | False -> "False"
-                         | BuildDef _ -> "BuildDef"
-                         | BuildDef2 _ -> "BuildDef2"
-                         | BuildProj _ -> "BuildProj"
-                         | EqTr _ -> "EqTr"
-                         | EqCgr _ -> "EqCgr"
-                         | EqCgrP _ -> "EqCgrP"
-                         | LiaMicromega _ -> "LiaMicromega"
-                         | LiaDiseq _ -> "LiaDiseq"
-                         | Qf_lemma _ -> "Qf_lemma"
-                                         
-                         | Hole _ -> "Hole"
-
-                         | ImmFlatten _ -> "ImmFlatten"
-                         | ImmBuildDef _ -> "ImmBuildDef"
-                         | ImmBuildDef2 _ -> "ImmBuildDef2"
-                         | ImmBuildProj _ -> "ImmBuildProj"
-                         | SplArith _ -> "SplArith"
-                         | SplDistinctElim _ -> "SplDistinctElim"
-                         | Forall_inst _ -> "Forall_inst"  end ^ ")"
+                           | Weaken _ -> "Weaken"
+                           | ImmFlatten _ -> "ImmFlatten"
+                           | True -> "True"
+                           | False -> "False"
+                           | BuildDef _ -> "BuildDef"
+                           | BuildDef2 _ -> "BuildDef2"
+                           | BuildProj _ -> "BuildProj"
+                           | ImmBuildDef _ -> "ImmBuildDef"
+                           | ImmBuildDef2 _ -> "ImmBuildDef2"
+                           | ImmBuildProj _ -> "ImmBuildProj"
+                           | EqTr _ -> "EqTr"
+                           | EqCgr _ -> "EqCgr"
+                           | EqCgrP _ -> "EqCgrP"
+                           | LiaMicromega _ -> "LiaMicromega"
+                           | LiaDiseq _ -> "LiaDiseq"
+                           | SplArith _ -> "SplArith"
+                           | SplDistinctElim _ -> "SplDistinctElim"
+                           | BBVar _ -> "BBVar"
+                           | BBConst _ -> "BBConst"
+                           | BBOp _ -> "BBOp"
+                           | BBNot _ -> "BBNot"
+                           | BBNeg _ -> "BBNeg"
+                           | BBAdd _ -> "BBAdd"
+                           | BBMul _ -> "BBMul"
+                           | BBUlt _ -> "BBUlt"
+                           | BBSlt _ -> "BBSlt"
+                           | BBConc _ -> "BBConc"
+                           | BBExtr _ -> "BBExtr"
+                           | BBZextn _ -> "BBZextn"
+                           | BBSextn _ -> "BBSextn"
+                           | BBShl _ -> "BBShl"
+                           | BBShr _ -> "BBShr"
+                           | BBEq _ -> "BBEq"
+                           | BBDiseq _ -> "BBDiseq"
+                           | RowEq _ -> "RowEq"
+                           | RowNeq _ -> "RowNeq"
+                           | Ext _ -> "Ext"
+                           | Hole _ -> "Hole"
+                           | Forall_inst _ -> "Forall_inst"
+                           | Qf_lemma _ -> "Qf_lemma"
+                         end ^ ")"