aboutsummaryrefslogtreecommitdiffstats
path: root/passes/pmgen
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2019-04-30 08:04:22 +0200
committerClifford Wolf <clifford@clifford.at>2019-04-30 08:04:22 +0200
commitbb4f3642deb1f607b82bff132e0aba5b1cef555b (patch)
tree655022ebca38929335b9de2049297f1500f78558 /passes/pmgen
parent58238da133fd236642f352c06f4056832b52d21c (diff)
downloadyosys-bb4f3642deb1f607b82bff132e0aba5b1cef555b.tar.gz
yosys-bb4f3642deb1f607b82bff132e0aba5b1cef555b.tar.bz2
yosys-bb4f3642deb1f607b82bff132e0aba5b1cef555b.zip
Some pmgen reorg, rename peepopt.pmg to peepopt_shiftmul.pmg
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'passes/pmgen')
-rw-r--r--passes/pmgen/Makefile.inc4
-rw-r--r--passes/pmgen/peepopt_shiftmul.pmg (renamed from passes/pmgen/peepopt.pmg)0
-rw-r--r--passes/pmgen/pmgen.py6
3 files changed, 6 insertions, 4 deletions
diff --git a/passes/pmgen/Makefile.inc b/passes/pmgen/Makefile.inc
index b8a14df90..a8cac7ea4 100644
--- a/passes/pmgen/Makefile.inc
+++ b/passes/pmgen/Makefile.inc
@@ -16,5 +16,7 @@ passes/pmgen/peepopt.o: passes/pmgen/peepopt_pm.h
EXTRA_OBJS += passes/pmgen/peepopt_pm.h
.SECONDARY: passes/pmgen/peepopt_pm.h
-passes/pmgen/peepopt_pm.h: passes/pmgen/pmgen.py passes/pmgen/peepopt.pmg
+PEEPOPT_PATTERN = passes/pmgen/peepopt_shiftmul.pmg
+
+passes/pmgen/peepopt_pm.h: passes/pmgen/pmgen.py $(PEEPOPT_PATTERN)
$(P) mkdir -p passes/pmgen && python3 $< -o $@ -p peepopt $(filter-out $<,$^)
diff --git a/passes/pmgen/peepopt.pmg b/passes/pmgen/peepopt_shiftmul.pmg
index d9d5757ca..d9d5757ca 100644
--- a/passes/pmgen/peepopt.pmg
+++ b/passes/pmgen/peepopt_shiftmul.pmg
diff --git a/passes/pmgen/pmgen.py b/passes/pmgen/pmgen.py
index 24ad07359..5860c634a 100644
--- a/passes/pmgen/pmgen.py
+++ b/passes/pmgen/pmgen.py
@@ -23,8 +23,7 @@ for o, a in opts:
debug = True
if outfile is None:
- outfile = args[-1]
- args = args[0:-1]
+ outfile = "/dev/stdout"
for a in args:
assert a.endswith(".pmg")
@@ -246,7 +245,8 @@ if debug:
pp.pprint(blocks)
with open(outfile, "w") as f:
- print("// Generated by pmgen.py from {}.pgm".format(prefix), file=f)
+ for fn in pmgfiles:
+ print("// Generated by pmgen.py from {}".format(fn), file=f)
print("", file=f)
print("#include \"kernel/yosys.h\"", file=f)