From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 21 Jun 2019 02:27:00 +0000 (-0700)
Subject: Fix broken abc9.v test due to inout being 1'bx
X-Git-Tag: working-ls180~1237^2~77
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9faeba7a66c34d57bcae6ad83580e640ee5907e6;p=yosys.git

Fix broken abc9.v test due to inout being 1'bx
---

diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 42f54209b..f0a9ccdb9 100644
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -75,6 +75,7 @@ struct XAigerWriter
 	dict<SigBit, int> ordered_outputs;
 
 	vector<Cell*> box_list;
+	bool omode = false;
 
 	int mkgate(int a0, int a1)
 	{
@@ -409,9 +410,9 @@ struct XAigerWriter
 			// If encountering an inout port, or a keep-ed wire, then create a new wire
 			// with $inout.out suffix, make it a PO driven by the existing inout, and
 			// inherit existing inout's drivers
-			if ((wire->port_input && wire->port_output && !undriven_bits.count(bit))
+			if ((wire->port_input && wire->port_output && output_bits.count(bit) && !undriven_bits.count(bit))
 					|| wire->attributes.count("\\keep")) {
-				log_assert(input_bits.count(bit) && output_bits.count(bit));
+				log_assert(output_bits.count(bit));
 				RTLIL::IdString wire_name = wire->name.str() + "$inout.out";
 				RTLIL::Wire *new_wire = module->wire(wire_name);
 				if (!new_wire)
@@ -486,6 +487,12 @@ struct XAigerWriter
 			ordered_outputs[bit] = aig_o++;
 			aig_outputs.push_back(bit2aig(bit));
 		}
+
+		if (output_bits.empty()) {
+			aig_o++;
+			aig_outputs.push_back(0);
+			omode = true;
+		}
 	}
 
 	void write_aiger(std::ostream &f, bool ascii_mode)
@@ -741,6 +748,8 @@ struct XAigerWriter
 		for (auto &it : output_lines)
 			f << it.second;
 		log_assert(output_lines.size() == output_bits.size());
+		if (omode && output_bits.empty())
+			f << "output " << output_lines.size() << " 0 $__dummy__\n";
 
 		wire_lines.sort();
 		for (auto &it : wire_lines)
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index ea3315267..a98ea8314 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -839,6 +839,10 @@ void AigerReader::post_process()
 				RTLIL::Wire* wire = outputs[variable + co_count];
 				log_assert(wire);
 				log_assert(wire->port_output);
+				if (escaped_s == "$__dummy__") {
+					wire->port_output = false;
+					continue;
+				}
 
 				if (index == 0) {
 					// Cope with the fact that a CO might be identical
@@ -948,12 +952,15 @@ void AigerReader::post_process()
 				other_wire->port_input = false;
 				other_wire->port_output = false;
 			}
-			if (wire->port_input && other_wire)
-				module->connect(other_wire, SigSpec(wire, i));
-			else
+			if (wire->port_input) {
+				if (other_wire)
+					module->connect(other_wire, SigSpec(wire, i));
+			}
+			else {
 								  // Since we skip POs that are connected to Sx,
 								  // re-connect them here
 				module->connect(SigSpec(wire, i), other_wire ? other_wire : SigSpec(RTLIL::Sx));
+			}
 		}
 	}