Merge remote-tracking branch 'origin/master' into xc7dsp

2 files changed, 18 insertions, 13 deletions

diff --git a/passes/pmgen/peepopt_dffmux.pmg b/passes/pmgen/peepopt_dffmux.pmg
index fbabf90f0..c88a52226 100644
--- a/passes/pmgen/peepopt_dffmux.pmg
+++ b/passes/pmgen/peepopt_dffmux.pmg
@@ -42,6 +42,12 @@ code
 		rst = port(rstmux, rstmuxBA).as_const();
 	int width = GetSize(D);
 
+	SigSpec &ceA = cemux->connections_.at(\A);
+	SigSpec &ceB = cemux->connections_.at(\B);
+	SigSpec &ceY = cemux->connections_.at(\Y);
+	SigSpec &dffD = dff->connections_.at(\D);
+	SigSpec &dffQ = dff->connections_.at(\Q);
+
 	if (D[width-1] == D[width-2]) {
 		did_something = true;
 
@@ -61,12 +67,12 @@ code
 			}
 		}
 
-		cemux->connections_.at(\A).remove(i, width-i);
-		cemux->connections_.at(\B).remove(i, width-i);
-		cemux->connections_.at(\Y).remove(i, width-i);
+		ceA.remove(i, width-i);
+		ceB.remove(i, width-i);
+		ceY.remove(i, width-i);
 		cemux->fixup_parameters();
-		dff->connections_.at(\D).remove(i, width-i);
-		dff->connections_.at(\Q).remove(i, width-i);
+		dffD.remove(i, width-i);
+		dffQ.remove(i, width-i);
 		dff->fixup_parameters();
 
 		log("dffcemux pattern in %s: dff=%s, cemux=%s; removed top %d bits.\n", log_id(module), log_id(dff), log_id(cemux), width-i);
@@ -88,11 +94,11 @@ code
 			if (init == State::Sx || init == D[i].data) {
 				count++;
 				module->connect(Q[i], D[i]);
-				cemux->connections_.at(\A).remove(i);
-				cemux->connections_.at(\B).remove(i);
-				cemux->connections_.at(\Y).remove(i);
-				dff->connections_.at(\D).remove(i);
-				dff->connections_.at(\Q).remove(i);
+				ceA.remove(i);
+				ceB.remove(i);
+				ceY.remove(i);
+				dffD.remove(i);
+				dffQ.remove(i);
 			}
 		}
 		if (count > 0) {
diff --git a/passes/pmgen/peepopt_shiftmul.pmg b/passes/pmgen/peepopt_shiftmul.pmg
index e1da52182..d4748ae19 100644
--- a/passes/pmgen/peepopt_shiftmul.pmg
+++ b/passes/pmgen/peepopt_shiftmul.pmg
@@ -50,9 +50,8 @@ code
 	if (GetSize(const_factor_cnst) > 20)
 		reject;
 
-	if (shift->type.in($shift, $shiftx))
-		if (GetSize(port(shift, \Y)) > const_factor)
-			reject;
+	if (GetSize(port(shift, \Y)) > const_factor)
+		reject;
 
 	int factor_bits = ceil_log2(const_factor);
 	SigSpec mul_din = port(mul, const_factor_port == \A ? \B : \A);