Merge remote-tracking branch 'origin/eddie/fix1132' into xc7mux

1 files changed, 52 insertions, 49 deletions

diff --git a/passes/techmap/muxcover.cc b/passes/techmap/muxcover.cc
index 0f86aeff0..61471e446 100644
--- a/passes/techmap/muxcover.cc
+++ b/passes/techmap/muxcover.cc
@@ -151,7 +151,7 @@ struct MuxcoverWorker
 				return true;
 			}
 			char port_name[3] = {'\\', *path, 0};
-			return follow_muxtree(ret_bit, tree, sigmap(tree.muxes.at(bit)->getPort(port_name)), path+1, false);
+			return follow_muxtree(ret_bit, tree, tree.muxes.at(bit)->getPort(port_name), path+1, false);
 		} else {
 			ret_bit = bit;
 			return true;
@@ -160,7 +160,7 @@ struct MuxcoverWorker
 
 	int prepare_decode_mux(SigBit &A, SigBit B, SigBit sel, SigBit bit)
 	{
-		if (A == B || sel == State::Sx)
+		if (A == B || sel == State::Sx || A == State::Sx || B == State::Sx)
 			return 0;
 
 		tuple<SigBit, SigBit, SigBit> key(A, B, sel);
@@ -324,22 +324,23 @@ struct MuxcoverWorker
 			ok = ok && follow_muxtree(G, tree, bit, "BBA");
 			ok = ok && follow_muxtree(H, tree, bit, "BBB");
 
-			ok = ok && follow_muxtree(U1, tree, bit, "S");
-
-			ok = ok && follow_muxtree(T1, tree, bit, "AS");
-			ok = ok && follow_muxtree(T2, tree, bit, "BS");
-
-			if (nodecode)
-				ok = ok && T1 == T2;
-
 			ok = ok && follow_muxtree(S1, tree, bit, "AAS");
 			ok = ok && follow_muxtree(S2, tree, bit, "ABS");
 			ok = ok && follow_muxtree(S3, tree, bit, "BAS");
 			ok = ok && follow_muxtree(S4, tree, bit, "BBS");
 
 			if (nodecode)
-				ok = ok && S1 == S2 && /*S2 == S3 &&*/ S3 == S4;
-						       // ^^ Should already be checked by T1 == T2 above
+				ok = ok && (S1 == S2 || S1 == State::Sx || S2 == State::Sx) &&
+					/*S2 == S3 && */
+					(S3 == S4 || S3 == State::Sx || S4 == State::Sx);
+
+			ok = ok && follow_muxtree(T1, tree, bit, "AS");
+			ok = ok && follow_muxtree(T2, tree, bit, "BS");
+
+			if (nodecode)
+				ok = ok && (T1 == T2 || T1 == State::Sx || T2 == State::Sx);
+
+			ok = ok && follow_muxtree(U1, tree, bit, "S");
 
 			if (ok)
 			{
@@ -356,13 +357,10 @@ struct MuxcoverWorker
 
 				mux.cost += prepare_decode_mux(T1, T2, U1, bit);
 
-				if (T1 != RTLIL::Sx) {
-					mux.cost += prepare_decode_mux(S1, S2, T1, bit);
-					mux.cost += prepare_decode_mux(S3, S4, T2, bit);
+				mux.cost += prepare_decode_mux(S1, S2, T1, bit);
+				mux.cost += prepare_decode_mux(S3, S4, T2, bit);
+				if (T1 != T2 && T1 != State::Sx && T2 != State::Sx)
 					mux.cost += prepare_decode_mux(S1, S3, U1, bit);
-				}
-				else
-					S1 = RTLIL::Sx;
 
 				mux.selects.push_back(S1);
 				mux.selects.push_back(T1);
@@ -402,13 +400,23 @@ struct MuxcoverWorker
 			ok = ok && follow_muxtree(O, tree, bit, "BBBA");
 			ok = ok && follow_muxtree(P, tree, bit, "BBBB");
 
-			ok = ok && follow_muxtree(V1, tree, bit, "S");
-
-			ok = ok && follow_muxtree(U1, tree, bit, "AS");
-			ok = ok && follow_muxtree(U2, tree, bit, "BS");
+			ok = ok && follow_muxtree(S1, tree, bit, "AAAS");
+			ok = ok && follow_muxtree(S2, tree, bit, "AABS");
+			ok = ok && follow_muxtree(S3, tree, bit, "ABAS");
+			ok = ok && follow_muxtree(S4, tree, bit, "ABBS");
+			ok = ok && follow_muxtree(S5, tree, bit, "BAAS");
+			ok = ok && follow_muxtree(S6, tree, bit, "BABS");
+			ok = ok && follow_muxtree(S7, tree, bit, "BBAS");
+			ok = ok && follow_muxtree(S8, tree, bit, "BBBS");
 
 			if (nodecode)
-				ok = ok && U1 == U2;
+				ok = ok && (S1 == S2 || S1 == State::Sx || S2 == State::Sx) &&
+					/*S2 == S3 &&*/
+					(S3 == S4 || S3 == State::Sx || S4 == State::Sx) &&
+					/*S4 == S5 &&*/
+					(S5 == S6 || S5 == State::Sx || S6 == State::Sx) &&
+					/*S6 == S7 &&*/
+					(S7 == S8 || S7 == State::Sx || S8 == State::Sx);
 
 			ok = ok && follow_muxtree(T1, tree, bit, "AAS");
 			ok = ok && follow_muxtree(T2, tree, bit, "ABS");
@@ -416,20 +424,17 @@ struct MuxcoverWorker
 			ok = ok && follow_muxtree(T4, tree, bit, "BBS");
 
 			if (nodecode)
-				ok = ok && T1 == T2 && /*T2 == T3 &&*/ T3 == T4;
-						       // ^^ Should already be checked by U1 == U2 above
+				ok = ok && (T1 == T2 || T1 == State::Sx || T2 == State::Sx) &&
+					/*T2 == T3 &&*/
+					(T3 == T4 || T3 == State::Sx || T4 == State::Sx);
 
-			ok = ok && follow_muxtree(S1, tree, bit, "AAAS");
-			ok = ok && follow_muxtree(S2, tree, bit, "AABS");
-			ok = ok && follow_muxtree(S3, tree, bit, "ABAS");
-			ok = ok && follow_muxtree(S4, tree, bit, "ABBS");
-			ok = ok && follow_muxtree(S5, tree, bit, "BAAS");
-			ok = ok && follow_muxtree(S6, tree, bit, "BABS");
-			ok = ok && follow_muxtree(S7, tree, bit, "BBAS");
-			ok = ok && follow_muxtree(S8, tree, bit, "BBBS");
+			ok = ok && follow_muxtree(U1, tree, bit, "AS");
+			ok = ok && follow_muxtree(U2, tree, bit, "BS");
 
 			if (nodecode)
-				ok = ok && S1 == S2 && /*S2 == S3 &&*/ S3 == S4 && /*S4 == S5 &&*/ S5 == S6 && /*S6 == S7 &&*/ S7 == S8;
+				ok = ok && (U1 == U2 || U1 == State::Sx || U2 == State::Sx);
+
+			ok = ok && follow_muxtree(V1, tree, bit, "S");
 
 			if (ok)
 			{
@@ -454,27 +459,25 @@ struct MuxcoverWorker
 
 				mux.cost += prepare_decode_mux(U1, U2, V1, bit);
 
-				if (U1 != RTLIL::Sx) {
+				if (U1 != State::Sx && U2 != State::Sx) {
 					mux.cost += prepare_decode_mux(T1, T2, U1, bit);
 					mux.cost += prepare_decode_mux(T3, T4, U2, bit);
 					mux.cost += prepare_decode_mux(T1, T3, V1, bit);
+				}
 
-					if (T1 != RTLIL::Sx) {
-						mux.cost += prepare_decode_mux(S1, S2, T1, bit);
-						mux.cost += prepare_decode_mux(S3, S4, T2, bit);
-						mux.cost += prepare_decode_mux(S5, S6, T3, bit);
-						mux.cost += prepare_decode_mux(S7, S8, T4, bit);
-						mux.cost += prepare_decode_mux(S1, S3, U1, bit);
-						mux.cost += prepare_decode_mux(S5, S7, U2, bit);
-						mux.cost += prepare_decode_mux(S1, S5, V1, bit);
-					}
-					else
-						S1 = RTLIL::Sx;
+				if (T1 != T2 && T1 != State::Sx && T2 != State::Sx) {
+					mux.cost += prepare_decode_mux(S1, S2, T1, bit);
+					mux.cost += prepare_decode_mux(S3, S4, T2, bit);
+					mux.cost += prepare_decode_mux(S1, S3, U1, bit);
 				}
-				else {
-					T1 = RTLIL::Sx;
-					S1 = RTLIL::Sx;
+				if (T3 != T4 && T3 != State::Sx && T4 != State::Sx) {
+					mux.cost += prepare_decode_mux(S5, S6, T3, bit);
+					mux.cost += prepare_decode_mux(S7, S8, T4, bit);
+					mux.cost += prepare_decode_mux(S5, S7, U2, bit);
 				}
+				if (T1 != T2 && T1 != State::Sx && T2 != State::Sx &&
+						T3 != T4 && T3 != State::Sx && T4 != State::Sx)
+					mux.cost += prepare_decode_mux(S1, S5, V1, bit);
 
 				mux.selects.push_back(S1);
 				mux.selects.push_back(T1);