diff options
| -rw-r--r-- | src/main/stanza/passes.stanza | 32 | ||||
| -rw-r--r-- | test/passes/jacktest/risc.fir | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index 8838b323..d2cecabe 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -256,6 +256,37 @@ defmethod map (f: Type -> Type, e: WSubfield) : defmethod map (f: Type -> Type, e: WIndex) : WIndex(exp(e), value(e), f(type(e)), gender(e)) +;================= Temparary Variable Elimination ======================== +; Returns a new Circuit where temporary variables are removed and returns +; the resulting nested expression + +defn temp-elimination (c:Circuit) : + val h = HashTable<Symbol,Expression>(symbol-hash) + defn is-temp? (n:Symbol) -> True|False : + println(n) + println(to-string(n)[0]) + println(to-string(n)[0] == 'T') + to-string(n)[0] == 'T' + defn temp-elim-e (e:Expression) : + match(map(temp-elim-e,e)) : + (e:Ref) : + if key?(h,name(e)) : h[name(e)] + else : e + (e) : e + defn temp-elim-s (s:Stmt) : + match(map(temp-elim-e,s)) : + (s:DefNode) : + if is-temp?(name(s)) : + h[name(s)] = value(s) + EmptyStmt() + else : s + (s) : map(temp-elim-s,s) + + Circuit(modules*, main(c)) where : + val modules* = + for m in modules(c) map : + Module(name(m), ports(m), temp-elim-s(body(m))) + ;================= Bring to Working IR ======================== ; Returns a new Circuit with Refs, Subfields, Indexes and DefAccessors ; replaced with IR-internal nodes that contain additional @@ -1949,6 +1980,7 @@ public defn run-passes (c: Circuit, p: List<Char>) : ; Early passes: ; If modules have a reset defined, must be an INPUT and UInt(1) + if contains(p,'q') : do-stage("Temp Elimination", temp-elimination) if contains(p,'a') : do-stage("Working IR", to-working-ir) if contains(p,'b') : do-stage("Resolve Kinds", resolve-kinds) if contains(p,'c') : do-stage("Make Explicit Reset", make-explicit-reset) diff --git a/test/passes/jacktest/risc.fir b/test/passes/jacktest/risc.fir index bf3eaf01..8422b50d 100644 --- a/test/passes/jacktest/risc.fir +++ b/test/passes/jacktest/risc.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl %s qabcdefghijklmnopj c | tee %s.out | FileCheck %s ; CHECK: Expand Whens circuit Risc : module Risc : |