diff options
author | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-04-03 11:23:31 +0000 |
---|---|---|
committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-04-03 11:23:31 +0000 |
commit | 5681594c83c2ba9a2c0e21983cac0f161ff95f02 (patch) | |
tree | ea458a8321f71b3e2fba5d67cfc3f79866241d48 /plugins/extraction/table.ml | |
parent | da1e32cbdc78050ea2e89eee896ba2b40db1b5dd (diff) |
Lazy loading of opaque proofs: fast as -dont-load-proofs without its drawbacks
The recent experiment with -dont-load-proofs in the stdlib showed that
this options isn't fully safe: some axioms were generated (Include ?
functor application ? This is still to be fully understood).
Instead, I've implemented an idea of Yann: only load opaque proofs when
we need them. This is almost as fast as -dont-load-proofs (on the stdlib,
we're now 15% faster than before instead of 20% faster with -dont-load-proofs),
but fully compatible with Coq standard behavior.
Technically, the const_body field of Declarations.constant_body now regroup
const_body + const_opaque + const_inline in a ternary type. It is now either:
- Undef : an axiom or parameter, with an inline info
- Def : a transparent definition, with a constr_substituted
- OpaqueDef : an opaque definition, with a lazy constr_substitued
Accessing the lazy constr of an OpaqueDef might trigger the read on disk of
the final section of a .vo, where opaque proofs are located.
Some functions (body_of_constant, is_opaque, constant_has_body) emulate
the behavior of the old fields. The rest of Coq (including the checker)
has been adapted accordingly, either via direct access to the new const_body
or via these new functions. Many places look nicer now (ok, subjective notion).
There are now three options: -lazy-load-proofs (default), -force-load-proofs
(earlier semantics), -dont-load-proofs. Note that -outputstate now implies
-force-load-proofs (otherwise the marshaling fails on some delayed lazy).
On the way, I fixed what looked like a bug : a module type
(T with Definition x := c) was accepted even when x in T was opaque.
I also tried to clarify Subtyping.check_constant.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13952 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'plugins/extraction/table.ml')
-rw-r--r-- | plugins/extraction/table.ml | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/plugins/extraction/table.ml b/plugins/extraction/table.ml index 8c9fdf37d..35494d3d2 100644 --- a/plugins/extraction/table.ml +++ b/plugins/extraction/table.ml @@ -175,14 +175,10 @@ let add_info_axiom r = info_axioms := Refset'.add r !info_axioms let remove_info_axiom r = info_axioms := Refset'.remove r !info_axioms let add_log_axiom r = log_axioms := Refset'.add r !log_axioms -let opaques_ok = ref Refset'.empty -let opaques_ko = ref Refset'.empty -let init_opaques () = opaques_ok := Refset'.empty; opaques_ko := Refset'.empty -let add_opaque_ok r = opaques_ok := Refset'.add r !opaques_ok -let add_opaque_ko r = opaques_ko := Refset'.add r !opaques_ko -let remove_opaque r = - opaques_ok := Refset'.remove r !opaques_ok; - opaques_ko := Refset'.remove r !opaques_ko +let opaques = ref Refset'.empty +let init_opaques () = opaques := Refset'.empty +let add_opaque r = opaques := Refset'.add r !opaques +let remove_opaque r = opaques := Refset'.remove r !opaques (*s Extraction modes: modular or monolithic, library or minimal ? @@ -263,23 +259,19 @@ let warning_axioms () = str "Having invalid logical axiom in the environment when extracting" ++ spc () ++ str "may lead to incorrect or non-terminating ML terms." ++ fnl ()) - end + end; + if !Flags.load_proofs = Flags.Dont && info_axioms@log_axioms <> [] then + msg_warning + (str "Some of these axioms might by due to option -dont-load-proofs.") let warning_opaques () = - let opaques_ok = Refset'.elements !opaques_ok in - if opaques_ok = [] then () + let opaques = Refset'.elements !opaques in + if opaques = [] then () else msg_warning (str "Extraction is accessing the body of the following opaque constants:" - ++ hov 1 (spc () ++ prlist_with_sep spc safe_pr_global opaques_ok) + ++ hov 1 (spc () ++ prlist_with_sep spc safe_pr_global opaques) ++ str "." ++ fnl () - ++ str "Be careful if using option -dont-load-proofs later." ++ fnl ()); - let opaques_ko = Refset'.elements !opaques_ko in - if opaques_ko = [] then () - else msg_warning - (str "Extraction cannot access the body of the following opaque constants:" - ++ hov 1 (spc () ++ prlist_with_sep spc safe_pr_global opaques_ko) - ++ fnl () ++ str "due to option -dont-load-proofs. " - ++ str "These constants are treated as axioms." ++ fnl ()) + ++ str "Be careful if using option -dont-load-proofs later." ++ fnl ()) let warning_both_mod_and_cst q mp r = msg_warning |