Some pmgen reorg, rename peepopt.pmg to peepopt_shiftmul.pmg

Signed-off-by: Clifford Wolf <clifford@clifford.at>

diff --git a/passes/pmgen/Makefile.inc b/passes/pmgen/Makefile.inc
index b8a14df903fb4037c103476bfdffaccfe03143fc..a8cac7ea47d97827bff75e6a46c89762b1bb00cc 100644 (file)
--- 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.pmg
deleted file mode 100644 (file)
index d9d5757..0000000
--- a/passes/pmgen/peepopt.pmg
+++ /dev/null
@@ -1,82 +0,0 @@
-pattern shiftmul
-
-state <SigSpec> shamt
-
-match shift
-       select shift->type.in($shift, $shiftx, $shr)
-endmatch
-
-code shamt
-       shamt = port(shift, \B);
-       if (shamt[GetSize(shamt)-1] == State::S0) {
-               do {
-                       shamt.remove(GetSize(shamt)-1);
-               } while (shamt[GetSize(shamt)-1] == State::S0);
-       } else
-       if (shift->type.in($shift, $shiftx) && param(shift, \B_SIGNED).as_bool()) {
-               reject;
-       }
-       if (GetSize(shamt) > 20)
-               reject;
-endcode
-
-match mul
-       select mul->type.in($mul)
-       select port(mul, \A).is_fully_const() || port(mul, \B).is_fully_const()
-       index <SigSpec> port(mul, \Y) === shamt
-endmatch
-
-code
-       IdString const_factor_port = port(mul, \A).is_fully_const() ? \A : \B;
-       IdString const_factor_signed = const_factor_port == \A ? \A_SIGNED : \B_SIGNED;
-       Const const_factor_cnst = port(mul, const_factor_port).as_const();
-       int const_factor = const_factor_cnst.as_int();
-
-       if (GetSize(const_factor_cnst) == 0)
-               reject;
-
-       if (const_factor_cnst.bits[GetSize(const_factor_cnst)-1] != State::S0 &&
-                       param(mul, const_factor_signed).as_bool())
-               reject;
-
-       if (GetSize(const_factor_cnst) > 20)
-               reject;
-
-       if (GetSize(port(shift, \Y)) > const_factor)
-               reject;
-
-       log("shiftmul pattern in %s: shift=%s, mul=%s\n", log_id(module), log_id(shift), log_id(mul));
-
-       int new_const_factor_log2 = ceil_log2(const_factor);
-       int new_const_factor = 1 << new_const_factor_log2;
-
-       SigSpec padding(State::Sx, new_const_factor-const_factor);
-       SigSpec old_a = port(shift, \A), new_a;
-       int trunc = 0;
-
-       if (GetSize(old_a) % const_factor != 0) {
-               trunc = const_factor - GetSize(old_a) % const_factor;
-               old_a.append(SigSpec(State::Sx, trunc));
-       }
-
-       for (int i = 0; i*const_factor < GetSize(old_a); i++) {
-               SigSpec slice = old_a.extract(i*const_factor, const_factor);
-               new_a.append(slice);
-               new_a.append(padding);
-       }
-
-       if (trunc > 0)
-               new_a.remove(GetSize(new_a)-trunc, trunc);
-
-       SigSpec new_b = {port(mul, const_factor_port == \A ? \B : \A), SigSpec(State::S0, new_const_factor_log2)};
-       if (param(shift, \B_SIGNED).as_bool())
-               new_b.append(State::S0);
-
-       shift->setPort(\A, new_a);
-       shift->setParam(\A_WIDTH, GetSize(new_a));
-       shift->setPort(\B, new_b);
-       shift->setParam(\B_WIDTH, GetSize(new_b));
-
-       blacklist(shift);
-       reject;
-endcode

diff --git a/passes/pmgen/peepopt_shiftmul.pmg b/passes/pmgen/peepopt_shiftmul.pmg
new file mode 100644 (file)
index 0000000..d9d5757
--- /dev/null
+++ b/passes/pmgen/peepopt_shiftmul.pmg
@@ -0,0 +1,82 @@
+pattern shiftmul
+
+state <SigSpec> shamt
+
+match shift
+       select shift->type.in($shift, $shiftx, $shr)
+endmatch
+
+code shamt
+       shamt = port(shift, \B);
+       if (shamt[GetSize(shamt)-1] == State::S0) {
+               do {
+                       shamt.remove(GetSize(shamt)-1);
+               } while (shamt[GetSize(shamt)-1] == State::S0);
+       } else
+       if (shift->type.in($shift, $shiftx) && param(shift, \B_SIGNED).as_bool()) {
+               reject;
+       }
+       if (GetSize(shamt) > 20)
+               reject;
+endcode
+
+match mul
+       select mul->type.in($mul)
+       select port(mul, \A).is_fully_const() || port(mul, \B).is_fully_const()
+       index <SigSpec> port(mul, \Y) === shamt
+endmatch
+
+code
+       IdString const_factor_port = port(mul, \A).is_fully_const() ? \A : \B;
+       IdString const_factor_signed = const_factor_port == \A ? \A_SIGNED : \B_SIGNED;
+       Const const_factor_cnst = port(mul, const_factor_port).as_const();
+       int const_factor = const_factor_cnst.as_int();
+
+       if (GetSize(const_factor_cnst) == 0)
+               reject;
+
+       if (const_factor_cnst.bits[GetSize(const_factor_cnst)-1] != State::S0 &&
+                       param(mul, const_factor_signed).as_bool())
+               reject;
+
+       if (GetSize(const_factor_cnst) > 20)
+               reject;
+
+       if (GetSize(port(shift, \Y)) > const_factor)
+               reject;
+
+       log("shiftmul pattern in %s: shift=%s, mul=%s\n", log_id(module), log_id(shift), log_id(mul));
+
+       int new_const_factor_log2 = ceil_log2(const_factor);
+       int new_const_factor = 1 << new_const_factor_log2;
+
+       SigSpec padding(State::Sx, new_const_factor-const_factor);
+       SigSpec old_a = port(shift, \A), new_a;
+       int trunc = 0;
+
+       if (GetSize(old_a) % const_factor != 0) {
+               trunc = const_factor - GetSize(old_a) % const_factor;
+               old_a.append(SigSpec(State::Sx, trunc));
+       }
+
+       for (int i = 0; i*const_factor < GetSize(old_a); i++) {
+               SigSpec slice = old_a.extract(i*const_factor, const_factor);
+               new_a.append(slice);
+               new_a.append(padding);
+       }
+
+       if (trunc > 0)
+               new_a.remove(GetSize(new_a)-trunc, trunc);
+
+       SigSpec new_b = {port(mul, const_factor_port == \A ? \B : \A), SigSpec(State::S0, new_const_factor_log2)};
+       if (param(shift, \B_SIGNED).as_bool())
+               new_b.append(State::S0);
+
+       shift->setPort(\A, new_a);
+       shift->setParam(\A_WIDTH, GetSize(new_a));
+       shift->setPort(\B, new_b);
+       shift->setParam(\B_WIDTH, GetSize(new_b));
+
+       blacklist(shift);
+       reject;
+endcode

diff --git a/passes/pmgen/pmgen.py b/passes/pmgen/pmgen.py
index 24ad0735977012d02d328737c03573c162df90ca..5860c634ae23a4bd7224f7bce70e0d42d04b3f70 100644 (file)
--- 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)