-
Notifications
You must be signed in to change notification settings - Fork 124
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/lean external arith shifts #968
Merged
bacam
merged 17 commits into
rems-project:sail2
from
GaloisInc:feature/lean_external_arith_shifts
Feb 13, 2025
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e98b63a
Adds lean external call for sub_nat
benjaminselfridge 8889757
Adds initial support for abs_int_plain
benjaminselfridge a6d4be0
Adds support for all primitives in arith.sail and flow.sail
benjaminselfridge 3788220
Adds support for eq_anything
benjaminselfridge 36d03d2
Merge remote-tracking branch 'origin/sail2' into feature/lean_externa…
benjaminselfridge 8dc7676
Removes comments from extern.sail
benjaminselfridge 9694dd8
Adds extern.expected.lean
benjaminselfridge 5c355b5
Merge remote-tracking branch 'origin/sail2' into feature/lean_externa…
benjaminselfridge 96b6257
Merge branch 'sail2' into feature/lean_external_arith
benjaminselfridge d7a877b
Updates extern.expected.lean
benjaminselfridge b8e0dec
Updates extern.expected.lean, after rebuild
benjaminselfridge d2bd89d
Merge branch 'sail2' into feature/lean_external_arith
benjaminselfridge dd6414e
Fixing extern.expected.lean (forgot to rebuild)
benjaminselfridge 17f594c
Add lean backends for the shift functiosn in arith.sail
benjaminselfridge 509aae6
feat: use `match_bv` when possible
arthur-adjedj da95663
Merge branch 'sail2' into feature/lean_external_arith_shifts
jprider63 dcf381a
Merge remote-tracking branch 'arthur/match_bv' into feature/lean_exte…
jprider63 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,212 @@ | ||
/- | ||
Copyright (c) 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
Released under Apache 2.0 license as described in the file LICENSE. | ||
Author(s): Shilpi Goel, Siddharth Bhat | ||
-/ | ||
|
||
-- Taken from https://github.com/leanprover/LNSym/blob/main/Arm/BitVec.lean | ||
|
||
import Lean.Elab.Term | ||
import Lean.Meta.Reduce | ||
import Std.Tactic.BVDecide | ||
|
||
open BitVec | ||
|
||
/- Bitvector pattern component syntax category, originally written by | ||
Leonardo de Moura. -/ | ||
declare_syntax_cat bvpat_comp | ||
syntax num : bvpat_comp | ||
syntax ident (":" num)? : bvpat_comp | ||
syntax "_" ":" num : bvpat_comp | ||
|
||
/-- | ||
Bitvector pattern syntax category. | ||
Example: [sf:1,0011010000,Rm:5,000000,Rn:5,Rd:5] | ||
-/ | ||
declare_syntax_cat bvpat | ||
syntax "[" bvpat_comp,* "]" : bvpat | ||
|
||
open Lean | ||
|
||
abbrev BVPatComp := TSyntax `bvpat_comp | ||
abbrev BVPat := TSyntax `bvpat | ||
|
||
/-- Return the number of bits in a bit-vector component pattern. -/ | ||
def BVPatComp.length (c : BVPatComp) : Nat := Id.run do | ||
match c with | ||
| `(bvpat_comp| $n:num) => | ||
let some str := n.raw.isLit? `num | pure 0 | ||
return str.length | ||
| `(bvpat_comp| $_:ident : $n:num) => | ||
return n.raw.toNat | ||
| `(bvpat_comp| $_:ident ) => | ||
return 1 | ||
| `(bvpat_comp| _ : $n:num) => | ||
return n.raw.toNat | ||
| _ => | ||
return 0 | ||
|
||
/-- | ||
If the pattern component is a bitvector literal, convert it into a bit-vector term | ||
denoting it. | ||
-/ | ||
def BVPatComp.toBVLit? (c : BVPatComp) : MacroM (Option Term) := do | ||
match c with | ||
| `(bvpat_comp| $n:num) => | ||
let len := c.length | ||
let some str := n.raw.isLit? `num | Macro.throwErrorAt c "invalid bit-vector literal" | ||
let bs := str.toList | ||
let mut val := 0 | ||
for b in bs do | ||
if b = '1' then | ||
val := 2*val + 1 | ||
else if b = '0' then | ||
val := 2*val | ||
else | ||
Macro.throwErrorAt c "invalid bit-vector literal, '0'/'1's expected" | ||
let r ← `(BitVec.ofNat $(quote len) $(quote val)) | ||
return some r | ||
| _ => return none | ||
|
||
/-- | ||
If the pattern component is a pattern variable of the form `<id>:<size>` return | ||
`some id`. | ||
-/ | ||
def BVPatComp.toBVVar? (c : BVPatComp) : MacroM (Option (TSyntax `ident)) := do | ||
match c with | ||
| `(bvpat_comp| $x:ident $[: $_:num]?) => | ||
return some x | ||
| _ => return none | ||
|
||
def BVPat.getComponents (p : BVPat) : Array BVPatComp := | ||
match p with | ||
| `(bvpat| [$comp,*]) => comp.getElems.reverse | ||
| _ => #[] | ||
|
||
/-- | ||
Return the number of bits in a bit-vector pattern. | ||
-/ | ||
def BVPat.length (p : BVPat) : Nat := Id.run do | ||
let mut sz := 0 | ||
for c in p.getComponents do | ||
sz := sz + c.length | ||
return sz | ||
|
||
/-- | ||
Return a term that evaluates to `true` if `var` is an instance of the pattern `pat`. | ||
-/ | ||
def genBVPatMatchTest (vars : Array Term) (pats : Array BVPat) : MacroM Term := do | ||
if vars.size != pats.size then | ||
Macro.throwError "incorrect number of patterns" | ||
let mut result ← `(true) | ||
|
||
for (pat, var) in pats.zip vars do | ||
let mut shift := 0 | ||
for c in pat.getComponents do | ||
let len := c.length | ||
if let some bv ← c.toBVLit? then | ||
let test ← `(extractLsb $(quote (shift + (len - 1))) $(quote shift) $var == $bv) | ||
result ← `($result && $test) | ||
shift := shift + len | ||
return result | ||
|
||
/-- | ||
Given a variable `var` representing a term that matches the pattern `pat`, and a term `rhs`, | ||
return a term of the form | ||
``` | ||
let y₁ := var.extract .. | ||
... | ||
let yₙ := var.extract .. | ||
rhs | ||
``` | ||
where `yᵢ`s are the pattern variables in `pat`. | ||
-/ | ||
def declBVPatVars (vars : Array Term) (pats : Array BVPat) (rhs : Term) : MacroM Term := do | ||
let mut result := rhs | ||
for (pat, var) in pats.zip vars do | ||
let mut shift := 0 | ||
for c in pat.getComponents do | ||
let len := c.length | ||
if let some y ← c.toBVVar? then | ||
let rhs ← `(extractLsb $(quote (shift + (len - 1))) $(quote shift) $var) | ||
result ← `(let $y := $rhs; $result) | ||
shift := shift + len | ||
return result | ||
|
||
/-- | ||
Define the `match_bv .. with | bvpat => rhs | _ => rhs`. | ||
The last entry is the `else`-case since we currently do not check whether | ||
the patterns are exhaustive or not. | ||
-/ | ||
syntax (name := matchBv) "match_bv " term,+ "with" (atomic("| " bvpat,+) " => " term)* ("| " "_ " " => " term)? : term | ||
|
||
open Lean | ||
open Elab | ||
open Term | ||
|
||
def checkBVPatLengths (lens : Array (Option Nat)) (pss : Array (Array BVPat)) : TermElabM Unit := do | ||
for (len, i) in lens.zipWithIndex do | ||
let mut patLen := none | ||
for ps in pss do | ||
unless ps.size == lens.size do | ||
throwError "Expected {lens.size} patterns, found {ps.size}" | ||
let p := ps[i]! | ||
let pLen := p.length | ||
|
||
-- compare the length to that of the type of the discriminant | ||
if let some pLen' := len then | ||
unless pLen == pLen' do | ||
throwErrorAt p "Exprected pattern of length {pLen}, found {pLen'} instead" | ||
|
||
-- compare the lengths of the patterns | ||
if let some pLen' := patLen then | ||
unless pLen == pLen' do | ||
throwErrorAt p "patterns have differrent lengths" | ||
else | ||
patLen := some pLen | ||
|
||
-- We use this to gather all the conditions expressing that the | ||
-- previous pattern matches failed. This allows in turn to prove | ||
-- exaustivity of the pattern matching. | ||
abbrev dite_gather {α : Sort u} {old : Prop} (c : Prop) [h : Decidable c] | ||
(t : old ∧ c → α) (e : old ∧ ¬ c → α) (ho : old) : α := | ||
h.casesOn (λ hc => e (And.intro ho hc)) (λ hc => t (And.intro ho hc)) | ||
|
||
@[term_elab matchBv] | ||
partial | ||
def elabMatchBv : TermElab := fun stx typ? => | ||
match stx with | ||
| `(match_bv $[$discrs:term],* with | ||
$[ | $[$pss:bvpat],* => $rhss:term ]* | ||
$[| _ => $rhsElse?:term]?) => do | ||
let xs := discrs | ||
|
||
-- try to get the length of the BV to error-out | ||
-- if a pattern has the wrong length | ||
-- TODO: is it the best way to do that? | ||
let lens ← discrs.mapM (fun x => do | ||
let x ← elabTerm x none | ||
let typ ← Meta.inferType x | ||
match_expr typ with | ||
| BitVec n => | ||
let n ← Meta.reduce n | ||
match n with | ||
| .lit (.natVal n) => return some n | ||
| _ => return none | ||
| _ => return none) | ||
|
||
checkBVPatLengths lens pss | ||
|
||
let mut result := | ||
← if let some rhsElse := rhsElse? then | ||
`(Function.const _ $rhsElse) | ||
else | ||
`(fun _ => by bv_decide) | ||
|
||
for ps in pss.reverse, rhs in rhss.reverse do | ||
let test ← liftMacroM <| genBVPatMatchTest xs ps | ||
let rhs ← liftMacroM <| declBVPatVars xs ps rhs | ||
result ← `(dite_gather $test (Function.const _ $rhs) $result) | ||
let res ← liftMacroM <| `($result True.intro) | ||
elabTerm res typ? | ||
| _ => throwError "invalid syntax" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Were you still planning on using shift operators for these? We're going to merge, but maybe you can open another PR with those updates.