Merge pull request #3961 from jix/dft-fixes

YosysHQ · Oct 2, 2023 · 8b42abe · 8b42abe
2 parents ecf09b9 + 5daa49b
commit 8b42abe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
@@ -405,7 +405,7 @@ struct DftTagWorker {
 			auto &sig_y = cell->getPort(ID::Y);
 			auto sig_a = cell->getPort(ID::A);
 			auto sig_b = cell->getPort(ID::B);
-			if (cell->type.in(ID($and), ID($or))) {
+			if (cell->type.in(ID($and), ID($or), ID($xor), ID($xnor))) {
 				sig_a.extend_u0(GetSize(sig_y), cell->getParam(ID::A_SIGNED).as_bool());
 				sig_b.extend_u0(GetSize(sig_y), cell->getParam(ID::B_SIGNED).as_bool());
 			}
@@ -669,12 +669,12 @@ struct DftTagWorker {
 			auto &sig_y = cell->getPort(ID::Y);
 			auto sig_a = cell->getPort(ID::A);
 
-			if (cell->type.in(ID($reduce_or), ID($reduce_bool), ID($logic_not)))
-				sig_a = autoNot(NEW_ID, sig_a);
-
 			auto group_sig_a = tag_group_signal(tag, sig_a);
 			auto tag_sig_a = tag_signal(tag, sig_a);
 
+			if (cell->type.in(ID($reduce_or), ID($reduce_bool), ID($logic_not)))
+				sig_a = autoNot(NEW_ID, sig_a);
+
 			auto filled = autoOr(NEW_ID, sig_a, group_sig_a);
 
 			auto prop = autoReduceAnd(NEW_ID, filled);