From 5298af3dffcd0985922a2a8317fa6a67e192a9c0 Mon Sep 17 00:00:00 2001 From: jackbackrack Date: Sat, 18 Apr 2015 13:23:16 -0700 Subject: change to have flo file go to a file --- src/main/stanza/firrtl-main.stanza | 10 ++++++++-- src/main/stanza/firrtl-test-main.stanza | 11 ++++++++--- src/main/stanza/passes.stanza | 17 ++++++++--------- 3 files changed, 24 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/main/stanza/firrtl-main.stanza b/src/main/stanza/firrtl-main.stanza index 92bb066f..fe9b49fa 100644 --- a/src/main/stanza/firrtl-main.stanza +++ b/src/main/stanza/firrtl-main.stanza @@ -21,10 +21,16 @@ defpackage firrtl-main : defn main () : val arg = commandline-arguments() val args = split(arg,' ') - val lexed = lex-file(args[1]) + val pathname = args[1] + val lexed = lex-file(pathname) val c = parse-firrtl(lexed) ;println(c) - run-passes(c,to-list(args[2])) + val dir = "." ;; could have dir arg + val name = last(split(pathname,'/')) + val basename = split(name,'.')[0] + val outname = string-join([dir "/" basename ".flo"]) + val c* = run-passes(c, to-list(args[2]), outname) + ;; run-passes(c,to-list(args[2])) main() diff --git a/src/main/stanza/firrtl-test-main.stanza b/src/main/stanza/firrtl-test-main.stanza index 991f7cf6..ca521ec2 100644 --- a/src/main/stanza/firrtl-test-main.stanza +++ b/src/main/stanza/firrtl-test-main.stanza @@ -28,14 +28,19 @@ defn set-printvars! (p:List) : defn main () : val args = commandline-arguments() - val lexed = lex-file(args[1]) + val pathname = args[1] + val lexed = lex-file(pathname) val c = parse-firrtl(lexed) + val dir = "." ;; could have dir arg + val name = last(split(pathname,'/')) + val basename = split(name,'.')[0] + val outname = string-join([dir "/" basename ".flo"]) if length(args) >= 4 : set-printvars!(to-list(args[3])) if length(args) >= 3 : - run-passes(c,to-list(args[2])) + run-passes(c,to-list(args[2]), outname) else : - run-passes(c,to-list("qabcefghipjklmno")) + run-passes(c,to-list("qabcefghipjklmno"), outname) main() diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index 24867612..30898ae6 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -1963,8 +1963,14 @@ public defn emit-flo (o:OutputStream, c:Circuit) : emit-module(o, modules(c)[0]) c +public defn emit-flo (pathname:String, c:Circuit) : + val out = FileOutputStream(pathname) + emit-flo(out, c) + close(out) + c + ;============= DRIVER ====================================== -public defn run-passes (c: Circuit, p: List) : +public defn run-passes (c: Circuit, p: List, pathname:String) : var c*:Circuit = c println("Compiling!") if PRINT-CIRCUITS : println("Original Circuit") @@ -1992,12 +1998,5 @@ public defn run-passes (c: Circuit, p: List) : if contains(p,'l') : do-stage("Inline Instances", inline-instances) if contains(p,'m') : do-stage("Split Expressions", split-exp) if contains(p,'n') : do-stage("Real IR", to-real-ir) - if contains(p,'o') : do-stage("To Flo", emit-flo{STANDARD-OUTPUT,_}) + if contains(p,'o') : do-stage("To Flo", emit-flo{pathname,_}) println("Done!") - - - ;; println("Shim for Jonathan's Passes") - ;; c* = shim(c*) - ;; println("Inline Modules") - ;; c* = inline-modules(c*) - ; c* -- cgit v1.2.3 From 2b2f658ffa16ad4c635e037cf77a4db85564da6b Mon Sep 17 00:00:00 2001 From: jackbackrack Date: Mon, 20 Apr 2015 15:52:47 -0700 Subject: better merge --- src/main/stanza/passes.stanza | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src') diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index 5c4f7ccf..d14da0b5 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -1954,12 +1954,6 @@ public defn emit-flo (file:String, c:Circuit) : false c -public defn emit-flo (pathname:String, c:Circuit) : - val out = FileOutputStream(pathname) - emit-flo(out, c) - close(out) - c - ;============= DRIVER ====================================== public defn run-passes (c: Circuit, p: List,file:String) : var c*:Circuit = c -- cgit v1.2.3 From 3f3e42337b04af3befd8a49faf35cfb6a23aa7dd Mon Sep 17 00:00:00 2001 From: jackbackrack Date: Tue, 21 Apr 2015 22:36:20 -0700 Subject: generate correct flo files --- src/main/stanza/passes.stanza | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index e05dfe39..c4e4598b 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -1890,7 +1890,7 @@ defn emit! (e:Expression,top:Symbol) : (e:Subfield) : emit-all([exp(e) "/" name(e)], top) (e:Index) : emit-all([exp(e) "/" value(e)], top) (e:Register) : - emit-all(["reg'" prim-width(type(e)) " " enable(e) " " value(e)], top) + emit-all(["reg'" prim-width(type(e)) " 1 " value(e)], top) ;; enable(e) (e:ReadPort) : emit-all(["rd'" prim-width(type(e)) " " enable(e) " " mem(e) " " index(e)], top) (e:DoPrim) : @@ -1922,6 +1922,16 @@ defn emit! (e:Expression,top:Symbol) : (e) : print-all(["EMIT(" e ")"]) ;(e) : emit-all(["mov'" prim-width(type(e)) " " e], top) ;TODO, not sure which one is right +defn maybe-mov (e:Expression) -> String : + val need-mov? = match(e) : + (e:Ref) : true + (e:UIntValue) : true + (e:SIntValue) : true + (e:Subfield) : true + (e:Index) : true + (e) : false + if need-mov?: "mov " else: "" + defn emit-s (s:Stmt, v:List, top:Symbol) : match(s) : (s:DefWire) : "" @@ -1929,7 +1939,7 @@ defn emit-s (s:Stmt, v:List, top:Symbol) : (s:DefMemory) : val vtype = type(s) as VectorType emit-all([top "::" name(s) " = mem'" prim-width(type(vtype)) " " size(vtype) "\n"], top) - (s:DefNode) : emit-all([top "::" name(s) " = " value(s) "\n"], top) + (s:DefNode) : emit-all([top "::" name(s) " = " maybe-mov(value(s)) value(s) "\n"], top) (s:Begin) : do(emit-s{_, v, top}, body(s)) (s:Connect) : if loc(s) typeof WritePort : @@ -1939,9 +1949,9 @@ defn emit-s (s:Stmt, v:List, top:Symbol) : else : val n = name(loc(s) as Ref) if contains?(v,n) : - emit-all([n " = out'" prim-width(type(loc(s))) " " exp(s) "\n"], top) + emit-all([top "::" n " = out'" prim-width(type(loc(s))) " " exp(s) "\n"], top) else : - emit-all([top "::" n " = " exp(s) "\n"], top) + emit-all([top "::" n " = " maybe-mov(exp(s)) exp(s) "\n"], top) (s) : s defn emit-module (m:Module) : -- cgit v1.2.3 From d1bc615be8e214713d5b13a767b2a8abbeeb173a Mon Sep 17 00:00:00 2001 From: jackbackrack Date: Tue, 21 Apr 2015 22:41:21 -0700 Subject: revert --- src/main/stanza/firrtl-main.stanza | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/stanza/firrtl-main.stanza b/src/main/stanza/firrtl-main.stanza index fe9b49fa..92bb066f 100644 --- a/src/main/stanza/firrtl-main.stanza +++ b/src/main/stanza/firrtl-main.stanza @@ -21,16 +21,10 @@ defpackage firrtl-main : defn main () : val arg = commandline-arguments() val args = split(arg,' ') - val pathname = args[1] - val lexed = lex-file(pathname) + val lexed = lex-file(args[1]) val c = parse-firrtl(lexed) ;println(c) - val dir = "." ;; could have dir arg - val name = last(split(pathname,'/')) - val basename = split(name,'.')[0] - val outname = string-join([dir "/" basename ".flo"]) - val c* = run-passes(c, to-list(args[2]), outname) - ;; run-passes(c,to-list(args[2])) + run-passes(c,to-list(args[2])) main() -- cgit v1.2.3 From 37c7573dd28a878fe250e1d8ce473fc48aa2fe59 Mon Sep 17 00:00:00 2001 From: jackbackrack Date: Thu, 23 Apr 2015 17:31:08 -0700 Subject: fix more bugs in flo backend --- src/main/stanza/passes.stanza | 48 ++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index e6206b60..9a259d27 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -1759,7 +1759,7 @@ defn split-exp (c:Circuit) : (e:Subfield|DoPrim|Pad|ReadPort|Register|WritePort) : val n* = if n typeof False : gensym(`T) - else : to-symbol $ string-join $ [n as Symbol gensym(`#)] + else : to-symbol $ string-join $ [n as Symbol gensym(`#)] add(v,DefNode(n*,e)) WRef(n*,type(e),NodeKind(),UNKNOWN-GENDER) (e) : e @@ -1901,8 +1901,17 @@ defn emit-all (es:Streamable, top:Symbol) : (ex) : print(ex) defn emit! (e:Expression,top:Symbol) : + defn greater-op? (op: PrimOp) -> True|False : + contains?([GREATER-OP, GREATER-UU-OP, GREATER-US-OP, GREATER-SU-OP, GREATER-SS-OP], op) + defn greater-eq-op? (op: PrimOp) -> True|False : + contains?([GREATER-EQ-OP, GREATER-EQ-UU-OP, GREATER-EQ-US-OP, GREATER-EQ-SU-OP, GREATER-EQ-SS-OP], op) + defn less-eq-op? (op: PrimOp) -> True|False : + contains?([LESS-EQ-OP, LESS-EQ-UU-OP, LESS-EQ-US-OP, LESS-EQ-SS-OP, LESS-EQ-SS-OP], op) + defn less-op? (op: PrimOp) -> True|False : + contains?([LESS-OP, LESS-UU-OP, LESS-US-OP, LESS-SS-OP, LESS-SS-OP], op) defn cmp-op? (op: PrimOp) -> True|False : - contains?([EQUAL-OP, NEQUAL-OP, GREATER-OP, LESS-EQ-OP, LESS-OP, GREATER-EQ-OP], op) + greater-op?(op) or greater-eq-op?(op) or less-op?(op) or less-eq-op?(op) or + contains?([EQUAL-OP, EQUAL-UU-OP, EQUAL-SS-OP, NEQUAL-OP, NEQUAL-UU-OP, NEQUAL-SS-OP], op) match(e) : (e:Ref) : emit-all([top "::" name(e)], top) (e:UIntValue) : emit-all([value(e) "'" sane-width(width(e))], top) @@ -1910,7 +1919,7 @@ defn emit! (e:Expression,top:Symbol) : (e:Subfield) : emit-all([exp(e) "/" name(e)], top) (e:Index) : emit-all([exp(e) "/" value(e)], top) (e:Pad) : - emit-all(["rsh'" prim-width(type(e)) " " value(e) " " width(e)], top) + emit-all(["rsh'" prim-width(type(e)) " " value(e) " " width(e)], top) (e:Register) : emit-all(["reg'" prim-width(type(e)) " 1 " value(e)], top) ;; enable(e) (e:ReadPort) : @@ -1918,10 +1927,10 @@ defn emit! (e:Expression,top:Symbol) : (e:DoPrim) : if cmp-op?(op(e)) : emit-all([flo-op-name(op(e)) "'" prim-width(type(args(e)[0]))], top) - if op(e) == GREATER-OP or op(e) == LESS-EQ-OP : - emit-all([" " args(e)[1] " " args(e)[0]], top) + if greater-op?(op(e)) or less-eq-op?(op(e)) : + emit-all([" " args(e)[1] " " args(e)[0]], top) else : - emit-all([" " args(e)[0] " " args(e)[1]], top) + emit-all([" " args(e)[0] " " args(e)[1]], top) else if op(e) == BIT-SELECT-OP : emit-all([flo-op-name(op(e)) "'1 " args(e)[0] " " consts(e)[0]], top) else if op(e) == BITS-SELECT-OP : @@ -1941,7 +1950,7 @@ defn emit! (e:Expression,top:Symbol) : for const in consts(e) do : print(" ") print(const) - (e) : print-all(["EMIT(" e ")"]) + (e) : error("SHOULDN'T EMIT THIS") ;; print-all(["EMIT(" e ")"]) ;(e) : emit-all(["mov'" prim-width(type(e)) " " e], top) ;TODO, not sure which one is right defn maybe-mov (e:Expression) -> String : @@ -1959,21 +1968,22 @@ defn emit-s (s:Stmt, v:List, top:Symbol) : (s:DefWire) : "" (s:DefInstance) : error("Shouldn't be here") (s:DefMemory) : - val vtype = type(s) as VectorType - emit-all([top "::" name(s) " = mem'" prim-width(type(vtype)) " " size(vtype) "\n"], top) - (s:DefNode) : emit-all([top "::" name(s) " = " maybe-mov(value(s)) value(s) "\n"], top) + val vtype = type(s) as VectorType + emit-all([top "::" name(s) " = mem'" prim-width(type(vtype)) " " size(vtype) "\n"], top) + (s:DefNode) : + if value(s) typeof WritePort : + val e = value(s) as WritePort + val n = gensym(`F) + emit-all([top "::" n " = wr'" prim-width(type(e)) " " enable(e) " " mem(e) " " index(e) " " name(s) "\n"], top) + else : + emit-all([top "::" name(s) " = " maybe-mov(value(s)) value(s) "\n"], top) (s:Begin) : do(emit-s{_, v, top}, body(s)) (s:Connect) : - if loc(s) typeof WritePort : - val e = loc(s) as WritePort - val name = gensym(`F) - emit-all([top "::" name " = wr'" prim-width(type(e)) " " enable(e) " " top "::" mem(e) " " index(e) " " exp(s) "\n"], top) + val n = name(loc(s) as Ref) + if contains?(v,n) : + emit-all([top "::" n " = out'" prim-width(type(loc(s))) " " exp(s) "\n"], top) else : - val n = name(loc(s) as Ref) - if contains?(v,n) : - emit-all([top "::" n " = out'" prim-width(type(loc(s))) " " exp(s) "\n"], top) - else : - emit-all([top "::" n " = " maybe-mov(exp(s)) exp(s) "\n"], top) + emit-all([top "::" n " = " maybe-mov(exp(s)) exp(s) "\n"], top) (s) : s defn emit-module (m:Module) : -- cgit v1.2.3