summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-03-21Jib: Add types to Phi functionsAlasdair Armstrong
Add a test case to ensure variable types in l-expressions remain the same with flow-sensitive constraints.
2019-03-21Revert some constant propagation experimentationThomas Bauereiss
See comments on e92ff687.
2019-03-21Merge pull request #38 from crabtw/sail2Alasdair Armstrong
Fix scattered mapping printing and output message for missing val spec
2019-03-20Coq: do more (and more uniform) simplificationBrian Campbell
2019-03-20Coq: be more careful about merging Sail variables and type variablesBrian Campbell
In particular, spot variable shadowing and handle (n as 'm) patterns.
2019-03-20Fix scattered mapping printing and output message for missing val specJyun-Yan You
2019-03-19C: Some simplificationAlasdair Armstrong
Remove unused experimental optimizations
2019-03-19Coq: simplify away more trivial boolsBrian Campbell
2019-03-19C: Inlining supportAlasdair Armstrong
Add a function Jib_optimize.inline which can inline functions. To make this more efficient, we can make identifiers unique on a per-function basis.
2019-03-19Coq: more test workBrian Campbell
- add dummy print_bits function - support int(1) like types in axioms
2019-03-19Coq: more work on testsBrian Campbell
- skip a few more that aren't supported yet - produce better debugging information (in particular, in the right order) - avoid some autocasts that aren't supported yet and are usually unnecessary - Handle more constraints like `8 * n = 8 * ?Goal`
2019-03-19Don't expand set constraints when substituting vars for varsBrian Campbell
It helps the Coq backend if the shape of constraints embedded in types doesn't change too much.
2019-03-18Coq: get axiom generation to merge bool tyvars with argumentsBrian Campbell
2019-03-15Don't constant-fold undefined_X functions in monomorphisationThomas Bauereiss
These should be preserved for prover backends.
2019-03-15Various monomorphisation tweaks and fixesThomas Bauereiss
2019-03-15Lem: Add missing implementations of vector_truncateLSBThomas Bauereiss
2019-03-15Add a rewriting pass for constant propagation in mutrecsThomas Bauereiss
Propagating constants into mutually recursive calls and removing dead branches might break mutually recursive cycles. Also make constant propagation use the existing interpreter-based constant folding to evaluate function calls with only constant arguments (as opposed to a mixture of inlining and hard-coded rewrite rules).
2019-03-15Coq: some progress on the test suiteBrian Campbell
Rewrite <> true/false in goals. Correct implicits in record and variant types. Use expanded valspecs from the type checker in axioms. Allow list notations in type definitions. Skip some not-yet-supported tests.
2019-03-15Interactive: Auto-complete options and add hintsAlasdair Armstrong
2019-03-15Interactive: Auto-complete file namesAlasdair Armstrong
Mostly just a small quality-of-life improvement
2019-03-15Coq: better loop handling, discharge some related proof obligationsBrian Campbell
2019-03-15C: Wrap Jib identifiersAlasdair
Avoids duplication between l-expressions and expressions. Also means that special variables like current_exception and have_exception are treated normally by functions such as instr_reads and instr_writes etc. Furthermore we can now easily annotate Jib identifiers in ways that were not previously possible with plain sail ids.
2019-03-14Add various useful methods to interactive modeAlasdair Armstrong
:def <definition> evaluates a top-level definition :(b)ind <id> : <type> creates an identifier within the interactive type-checking environment :let <id> = <expression> defines an identifier Using :def the following now works and brings the correct vector operations into scope. :def default Order dec :load lib/prelude.sail Also fix a type-variable shadowing bug
2019-03-14Fix unification missing variables in generated SMTAlasdair Armstrong
Some SMT goals in unification would generate problems with missing variables. Turns out the SMT solver would happily ignore this and return the correct unsat/sat result anyway. However, this does affect the error code from the solver so if we now check the return code we must make sure that we don't generate any smtlib files that generate warnings or errors. Now that kopts_of_X functions exist in ast_util we can just use those to get well-kinded variables from the constraint itself rather than relying on the typechecker to pass in a list of variables which makes things simpler to boot!
2019-03-14C: Some further tweaksAlasdair Armstrong
2019-03-14Report when the SMT solver fails badlyBrian Campbell
2019-03-13C: Improve Jib IR, add SSA representationAlasdair Armstrong
Add a CL_void l-expression so we don't have redundant unit-typed variables everywhere, and add an optimization in Jib_optimize called optimize_unit which introduces these. Remove the basic control-flow graph in Jib_util and add a new mutable control-flow graph type in Jib_ssa which allows the IR to be converted into SSA form. The mutable graph allows for more efficient updates, and includes both back and forwards references making it much more convenient to traverse. Having an SSA representation should make some optimizations much simpler, and is also probably more natural for SMT generation where variables have to be defined once using declare-const anyway. Debug option -ddump_flow_graphs now outputs SSA'd graphs of the functions in a specification.
2019-03-13Tell Lem that records parametrised over Ints need the len typeclass annotationsBrian Campbell
2019-03-12Coq: fix parametrized record typesBrian Campbell
2019-03-12Coq: fix some boolean issues seen in armBrian Campbell
Fixes bad precedence issues, removes an out-of-date special case that's not necessary, and solves more goals.
2019-03-11Improve ocamldoc commentsAlasdair Armstrong
Check in a slightly nicer stylesheet for OCamldoc generated documentation in etc. Most just add a maximum width and increase the font size because the default looks absolutely terrible on high-DPI monitors. Move val_spec_ids out of initial_check and into ast_util where it probably belongs. Rename some functions in util.ml to better match the OCaml stdlib.
2019-03-09C: Fix miscompilation of constrained struct field accessAlasdair
For a Int-parameterised struct F('x: Int) = ... the optimizer would attempt to optimize field access in cases where 'x was known to constrain the types of the struct fields only locally. Which would create a type error in the generated C. Now we always use the type from the global struct type. However, we previously weren't using struct type quantifiers to optimize the field representation, which we now do. Also rename some utility functions to better match the List functions in the OCaml stdlib.
2019-03-09Adds missing bits for DC/ICShaked Flur
2019-03-08Rewriter: Cleanup old sizeof rewritesAlasdair Armstrong
Shouldn't affect anything as this is done by the typechecker now. Also remove some unfinished tracing code from c_backend.ml
2019-03-08C: Refactor C backendAlasdair Armstrong
Main change is splitting apart the Sail->IR compilation stage and the C code generation and optimization phase. Rather than variously calling the intermediate language either bytecode (when it's not really) or simply IR, we give it a name: Jib (a type of Sail). Most of the types are still prefixed by c/C, and I don't think it's worth changing this. The various parts of the C backend are now in the src/jib/ subdirectory src/jib/anf.ml - Sail->ANF translation src/jib/jib_util.ml - various Jib AST processing and helper functions (formerly bytecode_util) src/jib/jib_compile.ml - Sail->Jib translation (using Sail->ANF) src/jib/c_backend.ml - Jib->C code generator and optimizations Further, bytecode.ott is now jib.ott and generates jib.ml (which still lives in src/ for now) The optimizations in c_backend.ml should eventually be moved in a separate jib_optimization file. The Sail->Jib compilation can be parameterised by two functions - one is a custom ANF->ANF optimization pass that can be specified on a per Jib backend basis, and the other is the rule for translating Sail types in Jib types. This can be more or less precise depending on how precise we want to be about bit-widths etc, i.e. we only care about <64 and >64 for C, but for SMT generation we would want to be as precise as possible. Additional improvements: The Jib IR is now agnostic about whether arguments are allocated on the heap vs the stack and this is handled by the C code generator. jib.ott now has some more comments explaining various parts of the Jib AST. A Set module and comparison function for ctyps is defined, and some functions now return ctyp sets rather than lists to avoid repeated work.
2019-03-08Fix: Never consider single variable types to be ambiguousAlasdair
2019-03-07Remove more dead branchesThomas Bauereiss
2019-03-07Also remove impossible if-branchesThomas Bauereiss
2019-03-07Fix bug in a mono rewrite helper functionThomas Bauereiss
2019-03-07C: Make instrs_graph return just control flow graphAlasdair Armstrong
Previously instrs_graph would return the control-flow graph, as well as some data-flow by including reads and writes to variables represented as a node type in the graph (G_id). However, this was not particularly useful, and since the graph isn't in SSA form (so identifiers are non-unique) potentially inaccurate too. This simplifies the code so instrs_graph just returns control flow dependencies, which in turn simplifies the instr_reads and instr_writes functions.
2019-03-07Add a rewrite to remove impossible cases on integer literalsBrian Campbell
(e.g., for the dual 32/64 bit RISC-V model) Apply this rewrite in Coq backend.
2019-03-07Simplify handling of referenced variables in constant propagationBrian Campbell
2019-03-07Extract constant propagation and related functions from monomorphisation.Brian Campbell
This shouldn't change any functionality.
2019-03-06Add an -ir option to print the intermediate representation of a fileAlasdair Armstrong
2019-03-06Improve AST slicingAlasdair Armstrong
2019-03-06Add option to slice out printing and tracing functions when generating CAlasdair Armstrong
Make instruction dependency graph use graph.ml Expose incremental graph building functions for performance in graph.mli
2019-03-05Fix missing case in specializationAlasdair
2019-03-05More optimizations and improvments for C generationAlasdair Armstrong
Add some comments in constant_fold.ml
2019-03-05Coq: use more local type information when constructing tuplesBrian Campbell
2019-03-05Coq: some debugging messagesBrian Campbell