Update LICM/Reaching to node use NodeId

This commit is contained in:
2026-08-09 17:35:30 -05:00
parent 1eecf45c0f
commit 269906871f
2 changed files with 73 additions and 64 deletions

View File

@@ -1,6 +1,5 @@
import Spa.Analysis.Forward
import Spa.Lattice.Finset
import Spa.Language.Tagged.Graphs
import Spa.Showable
namespace Spa
@@ -13,20 +12,18 @@ instance {n : } : Showable (Finset (Fin n)) :=
(fun i rest => if i s then show' i ++ ", " ++ rest else rest) ""
++ "}"
abbrev DefSet (prog : Program) : Type := Finset prog.NodeId
abbrev DefSet (prog : Program) : Type := Finset prog.State
namespace ReachingAnalysis
variable (prog : Program)
def genSet (s : prog.State) : DefSet prog := (prog.nodeIdOf s).elim {} (fun x => {x})
def eval (s : prog.State) (vs : VariableValues (DefSet prog) prog) : VariableValues (DefSet prog) prog :=
match prog.code s with
| none => vs
| some bs =>
match bs with
| .assign k _ => FiniteMap.generalizedUpdate id (fun _ _ => genSet prog s) [k] vs
| .assign k _ => FiniteMap.generalizedUpdate id (fun _ _ => {s}) [k] vs
| .noop => vs
lemma eval_mono (s : prog.State) :
@@ -50,12 +47,11 @@ def output : String :=
abbrev Run (prog : Program) : Type := List (prog.State × BasicStmt)
@[aesop unsafe cases]
inductive LastAssign (prog : Program) (x : String) : Run prog prog.NodeId Prop
| here (s : prog.State) (e : Expr) (hc : prog.code s = some (.assign x e))
(rest : Run prog) :
LastAssign prog x ((s, .assign x e) :: rest) (prog.nodeIdOfNonempty s hc)
inductive LastAssign (prog : Program) (x : String) : Run prog prog.State Prop
| here (s : prog.State) (e : Expr) (rest : Run prog) :
LastAssign prog x ((s, .assign x e) :: rest) s
| there (s : prog.State) (bs : BasicStmt) (hc : prog.code s = some bs)
(rest : Run prog) {n : prog.NodeId} :
(rest : Run prog) {n : prog.State} :
( e, bs .assign x e) LastAssign prog x rest n
LastAssign prog x ((s, bs) :: rest) n
@@ -73,7 +69,7 @@ instance stateInterp : StateInterpretation (DefSet prog) prog where
Post := @runOfTrace prog
interp vs run := (x : String) (assigners : DefSet prog), (x, assigners) vs
(n : prog.NodeId), LastAssign prog x run n n assigners
(n : prog.State), LastAssign prog x run n n assigners
interp_sup := by
intro vs₁ vs₂ run h x assigners hmem n hla
obtain a₁, a₂, rfl, h₁, h₂ := FiniteMap.mem_sup hmem
@@ -105,8 +101,7 @@ private lemma valid_step (s : prog.State) {ρ₁ ρ₂ : Env}
by_cases hx : k = x
· subst hx
have hd := FiniteMap.generalizedUpdate_mem_eq (List.mem_singleton.mpr rfl) hmem
rcases hla
<;> simp [Program.nodeIdOfNonempty, hd, genSet, Option.get] <;> aesop
rcases hla <;> simp [hd] <;> aesop
· have hmem' := FiniteMap.generalizedUpdate_not_mem_backward
(fun hc => hx (List.mem_singleton.mp hc)) hmem
aesop