Commit Graph

249 Commits

Author SHA1 Message Date
robdockins
cd0748cc74
Merge pull request #1161 from felixonmars/patch-2
Allow sbv 8.14
2021-04-20 10:22:19 -07:00
Felix Yan
6d17c2e97b
Allow sbv 8.14
Tested to build fine here.
2021-04-14 03:33:21 +08:00
Rob Dockins
3f185449ee Move WordValue into a separate module. 2021-04-13 10:27:17 -07:00
Rob Dockins
3f710468e8 Break SeqMap out into a separate module 2021-04-13 10:27:17 -07:00
Rob Dockins
234437af06 Remove our dependency on the random package.
Instead, directly use the generators defined in `tf-random`.
This changes the generation algorithm for some types, so we
need to update the tests that depend on those concrete values.

Fixes #1102
2021-04-07 12:12:32 -07:00
robdockins
c2ef506902
Merge pull request #1139 from felixonmars/patch-2
Allow sbv 8.13
2021-04-06 10:15:20 -07:00
Iavor S. Diatchki
523a2dcd5b
Merge pull request #1048 from GaloisInc/nested-modules
Nested modules
2021-04-06 08:40:42 -07:00
Aaron Tomb
e3c4e37d0c
Bump version after release (#1148) 2021-04-05 09:52:25 -07:00
Iavor Diatchki
1532223149 Redo the scoping on the command line and browsing.
This fixes a bug where the scoping on the command line was incorrect
for nested modules.

It also changes the semantics of `:browse` (whose implementation is now
in a separate module), to be more reasonable. See #689
2021-04-02 16:07:48 -07:00
Iavor Diatchki
501f884353 Merge branch 'master' into nested-modules 2021-04-01 15:23:02 -07:00
Felix Yan
b7f9aba816
Allow sbv 8.13
Tested to build fine here.
2021-03-30 21:11:22 +08:00
Lisanna Dettwyler
f021990eba
Prep CI for upcoming release (#1123)
- Container images are now published to ghcr.io rather than docker hub (closes #1110):
  - https://github.com/orgs/GaloisInc/packages/container/package/cryptol
  - https://github.com/orgs/GaloisInc/packages/container/package/cryptol-remote-api
- Docker builds for all images are cached against ghcr.io (doesn't provide incremental builds, but it still helps a lot).
  - https://github.com/orgs/GaloisInc/packages/container/package/cache-cryptol
  - https://github.com/orgs/GaloisInc/packages/container/package/cache-cryptol-remote-api
- "Portable" variant of cryptol-remote-api is now built and tested to the same degree as the non-portable one
- Normalized CI workflows to [`.github/workflows/ci.yml`](https://github.com/GaloisInc/cryptol/blob/lisanna/docker-publishing/.github/workflows/ci.yml) (closes #1115)
- Pre-merge and release build configurations are now more or less the same, so release process remains validated (closes #1114, closes #1116)
- Matrix configs for each job are visible at high-level views of the workflow
- Always upload workflow artifacts, use sensible retention periods for publish vs. non-publish
- `cryptol-eval-server` included in cryptol-remote-api container image (closes #1112)
- Pathclearing for static linking (#1113)
2021-03-23 15:24:48 -07:00
Felix Yan
77dedc3fec
Allow sbv 8.12 (#1126)
Tested to build fine here.
2021-03-22 13:47:23 -07:00
Felix Yan
89660676b1
Allow sbv 8.11
Tested to build fine here.
2021-03-13 19:13:49 +08:00
Iavor Diatchki
34b1d87df3 Implementation of nested modules.
* Limitations:
    Does not work in combination parameterized modules, as I am
    about to redo how that works.

  * General refeactorings:
    * Namespaces:
      - We have an explicit type for namespaces, see `Cryptol.Util.Ident`
      - Display environments should now be aware of the namespace of the
        name being displayed.

    * Renamer:
      - Factor out the renamer monad and error type into separate modules
      - All name resultion is done through a single function `resolveName`
      - The renamer now computes the dependencies between declarations,
         orders things in dependency order, and checks for bad recursion.

    * Typechecker: Redo checking of declarations (both top-level and local).
      Previously we used a sort of CPS to add things in scope.   Now we use
      a state monad and add things to the state.  We assume that the renamer
      has been run, which means that declarations are ordered in dependency
      order, and things have unique name, so we don't need to worry about
      scoping too much.

  * Change specific to nested modules:
    - We have a new namespace for module names
    - The interface file of a module contains the interfaces for nested modules
    - Most of the changes related to nested modules in the renamer are
      in `ModuleSystem.NamingEnv` and `ModuleSystem.Rename`
        - There is some trickiness when resolving module names when importing
          submodules (seed `processOpen` and `openLoop`)
    - There are some changes to the representation of modules in the typechecked
      syntax, in particular:
        - During type-checking we "flatten" nested module declarations into
          a single big declaration.  Hopefully, this means that passes after
          the type checker don't need to worry about nested modules
        - There is a new field containing the interfaces of the nested modules,
          this is needed so that when we import the module we know we have the
          nested structure
        - Declarations in functor/parameterzied modules do not appear in the
          flattened list of declarations.  Instead thouse modules are collected
          in a separate field, and the plan is that they would be used from
          there when we implmenet functor instantiation.
2021-03-12 09:55:56 -08:00
Felix Yan
a0aa00d15f
Allow sbv 8.10
Tested to build fine here.
2021-02-16 17:21:31 +08:00
Rob Dockins
0909120a68 Convert to using the SFloat module from What4.
Expose some additional primitives, such as FMA,
abs, sqrt, and more classification predicates.

Refactor the primitives table for floating-point
values into a single generic table that uses
methods from the `Backend` class.
2021-02-08 17:47:49 -08:00
Rob Dockins
78855e7967 Update to use libBF version 0.6, which has some bugfixes
and additional operations.
2021-01-28 17:03:46 -08:00
Rob Dockins
ef442be296 Refactor how primitives are represented. We invent a lightweight syntax
for primitives that is evaluated to values when a primitive is looked up
at evaluation time.  Currently, this does not add any additional capabilities,
but gives us the ability to modify the representation of values
without touching all the primitive definitions, and gives us a place to
hook in additional capabilies to the primitives.

As part of this refactoring, the primitives that are defined totally
generically are moved to the `Cryptol.Eval.Generic` module and
used uniformly in all the backends.
2020-12-01 11:01:21 -08:00
Felix Yan
052d88a247 Fix compatibility with SBV 8.8 & 8.9
Tested with SBV 8.9 here and it built fine.
2020-11-30 11:43:25 -08:00
Ben Selfridge
861e9e9651
Feature/docs checking (#976)
* Adds a stub executable to cabal file for checking docs

* [WIP] Adds check-exercises executable

A program that checks that the exercises in Programming Cryptol actual work when
executed against an Cryptol REPL. Instead of using \begin{Verbatim}, we use
\begin{REPL} in both the exercise and the answer, which is rendered the same but
gets checked by this program.

This is a WIP -- we still need to do a number of things, including (but not
limited to):

* Move the "REPL" macro out of CrashCourse.tex and into some including latex
  file
* Change many of the "Verbatim"s into "REPL"s to test if this approach works in
  general

* Several updates

* Moves REPL command definitions into main latex file

* Generalizes repl commands

* Several improvements:

* documentation of CheckExercises.hs
* factoring out addReplData, addReplin, addReplout, nextLine functions
* took the IO out of P monad (shouldn't have been there)
* worked on annotating repls for many exercises/examples in crash course

* Adds a README for check-exercises

* Uses cryptol's -e option to detect errors

* updates ProgrammingCryptol.pdf

* Fixes main function

After changing to use the -e option to detect errors, I used cabal v2-exec which
apparently does not rebuild anything, but I thought it did. This just fixes the
code so it builds again.
2020-11-20 16:53:36 -08:00
Aaron Tomb
c296e9aad6 Bump Cryptol version after release 2020-11-20 13:47:59 -08:00
Aaron Tomb
0541bcf559
Preparation for the 2.10 release (#972)
* Update CHANGES for 2.10

* Remove profiling flags from Cabal file

They result in `cabal check` warnings and probably don’t need to be
hard-coded.

* Remove commented-out Cryptol server references

The code no longer exists, so we’ll never uncomment these.

Equivalent functionality is now provided by `cryptol-remote-api`.

* Update references to version numbers in README. Closes #719.
2020-11-18 15:38:44 -08:00
Rob Dockins
9511dd856f Fix some cabal warnings and such 2020-11-10 09:36:05 -08:00
Rob Dockins
32e081c5ae Update cabal file to include all relevant files in the lib directory. 2020-10-27 17:40:39 -07:00
Rob Dockins
44e5f45ae3 Add faster primitive implementations for pmult, pdiv, and pmod. 2020-10-27 10:51:10 -07:00
Rob Dockins
ed59558913 Also move the Cryptol.Eval.Arch module under the Backend tree 2020-10-12 14:09:30 -07:00
Rob Dockins
9faa283613 Code motion and renaming related to the bulk file move
that created the `Backend` module tree.

The main change here is that the `Cryptol.Eval.SBV` module was split
into two, similar to how the concrete and What4 evaluators were already
split.  Various other small bits of code are rearranged to detangle
module dependencies.
2020-10-12 14:09:30 -07:00
Rob Dockins
dd5452d658 Perform internal modular arithmetic on the BigNat type instead
of `Integer`.  This resuts in a modest reduction in runtime.
2020-09-29 22:00:14 -07:00
Rob Dockins
dfd7020a68 Add a new built-in module for prime-field eliptic curves,
based on the arithemetic routines from:
https://github.com/GaloisInc/cryptol-specs/blob/master/Primitive/Asymmetric/Signature/ECDSA/doc/10.1.1.204.9073.pdf
2020-09-29 22:00:14 -07:00
Rob Dockins
a1cf62e81d Rely on integer-gmp primitives for primality tests and
modular inverse computations instead of using the arithmoi and
semiring packages.
2020-09-29 14:55:05 -07:00
Rob Dockins
74cc36ce50 Implement the Field operations on Z p in the concrete simulator
and the What4 symbolic simulator.

We use the EGCD algorithm to compute inverses for concrete values.
For symbolic values, we posit a multiplicitive inverse via a defining
equation.  To get this to work, we needed to fix a bug in the
equation definition code for What4; it was asserting definitions
with the wrong polarity for "prove" calls.
2020-09-29 14:55:05 -07:00
Rob Dockins
b5bdd0fa80 Add basic support for primality checking in the type system. 2020-09-29 14:55:05 -07:00
Rob Dockins
e8f7fa9435 Add a basic implementation of AES to the SuiteB module.
This implementation is taken fairly directly from the SBV
tutorial module.  It is a Word32-oriented implementation using
TBoxes.  We make the implementation avalible via Cryptol primitives
that are similar to the AESNI instructions, with primitives for
the individual rounds and some utility primitives for performing
key expansion.
2020-09-21 14:54:28 -07:00
Rob Dockins
44dae69012 Add a Haskell-native implementation of the SHA256 and SHA512
block functions, ripped out of the SHA package, and expose
it via new Cryptol primitives.

Using these primitives in place of the defined reference implementations
leads to approx 100x speed-up in larger protocols that do a lot of hashing.

I don't know if this is the implementation we'll actually end up using,
but this verifies the overall idea and helps design the API.
2020-09-21 14:54:28 -07:00
Brian Huffman
f35fe36219 Set an upper bound of sbv < 8.8.
In version 8.8 the type of `svMkSymVar` has changed, and so cryptol
cannot currently be compiled with sbv-8.8.

Fixes #879.
2020-09-11 10:59:59 -07:00
Rob Dockins
d26da1ad0c Rework the thunk lifecycle to remove race conditions.
Thunk state is now controlled using transational memory variables
instead of IORefs, and the thunk likecycle is made more explicit
in the relevant datatypes.  Threads will now properly block and wait
when forcing a thunk that is already under evaluation by a different
thread.  Hopefully, using optimistic concurrency (transactional memory)
will help reduce concurrency contention. The reworked lifecycle
datastructures hopefully will release closures related to evaluation
faster, which should reduce memory pressure somewhat.

Fixes #856
2020-09-02 09:09:21 -07:00
Aaron Tomb
3cfb3a45bd Bump version 2020-08-31 19:45:12 -07:00
Aaron Tomb
5100132e4c
Tweak a few things for 2.9.0 (#833)
* Fix Dockerfile

* Include version number in CHANGES.md

* Update copyright dates

* Don't include cryptol-specs in release archives

* Remove duplicate copy of Programming Cryptol
2020-07-28 08:41:27 -07:00
Rob Dockins
98ee00742f Remove What4 submodule and depend on hackage-relased What4 instead. 2020-07-21 23:21:21 -07:00
Rob Dockins
1be435c67a Set SBV bounds to >= 8.6
This is consistent with our current testing, and
fixes #795
2020-07-02 14:44:47 -07:00
Rob Dockins
a9e2eed755 Add any solver support to the What4 backend.
This turned out to be relatively straightforward.  Using
a simliar strategy to SBV, we simply spawn off all the solvers
in separate threads and wait using the `async` package.
Some minor fixes in `What4` allow the threads to respond properly
to being interrupted.

Some care is required to install the necessary solver options
_before_ spawning off the threads to avoid race conditions
in the configuration datastructure itself; such race conditions should
be fixed in What4 at some point.
2020-07-02 14:44:47 -07:00
Iavor Diatchki
332450ebb2 Switch to using libBF from hackage 2020-07-01 11:35:45 -07:00
Rob Dockins
6c6cb94d46 Implement and use a new RecordMap type.
This type stores records as a finite map from field names to
values, while also remembering the original order of the fields
from when the record was generated (usually, from the program source).
For all "semantic" purposes, the fields are treated as appearing in
a canoical order (in sorted order of the field names).  However, for
user display purposes, records are presented in the order in which
the fields were originally stated.

In the course of implementing this, I discovered that we were not
previously checking for repeated fields in the parser or typechecker,
which would result in some rather strange situations and could probably
be used to break the type safety. This is now fixed and repeated fields
will result in either a parse error or a panic (for records generated
internally).

Fixes #706
2020-06-30 12:34:50 -07:00
Iavor Diatchki
0047eaf77a Initial support for floating point computation 2020-06-29 15:31:34 -07:00
Ben Selfridge
22d98c72b8 update to bv-sized branch of what4 2020-06-04 15:51:35 -07:00
Rob Dockins
dcbd70bf2b Update CHANGES and bumb version number 2020-05-15 10:42:45 -07:00
Kevin Quick
393451681b
Updates for haskeline 0.8 and use of exceptions package. 2020-05-06 14:16:53 -07:00
Rob Dockins
922350ff7a Put together enough of the framework required to run :sat and :prove
queries via What4.  We still need to support configuring the solver to use,
multisat queries, and portfolio solving.
2020-04-27 14:19:44 -07:00
Rob Dockins
44a2b8e236 Very basic scaffolding for using what4 as a symbolic backend 2020-04-27 14:19:44 -07:00